Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4

1 files changed, 2031 insertions, 2017 deletions

diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.c b/plugins/shotwell-publishing-extras/TumblrPublishing.c
index a04cec6..8749112 100644
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.c
+++ b/plugins/shotwell-publishing-extras/TumblrPublishing.c
@@ -1,4 +1,4 @@
-/* TumblrPublishing.c generated by valac 0.34.7, the Vala compiler
+/* TumblrPublishing.c generated by valac 0.36.6, the Vala compiler
  * generated from TumblrPublishing.vala, do not modify */
 
 /* Copyright 2012 BJA Electronics
@@ -155,9 +155,20 @@ typedef struct _PublishingTumblrTumblrPublisherUploader PublishingTumblrTumblrPu
 typedef struct _PublishingTumblrTumblrPublisherUploaderClass PublishingTumblrTumblrPublisherUploaderClass;
 #define _publishing_rest_support_batch_uploader_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_batch_uploader_unref (var), NULL)))
 typedef struct _PublishingTumblrTumblrPublisherAuthenticationPanePrivate PublishingTumblrTumblrPublisherAuthenticationPanePrivate;
+enum  {
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LOGIN_SIGNAL,
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LAST_SIGNAL
+};
+static guint publishing_tumblr_tumblr_publisher_authentication_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LAST_SIGNAL] = {0};
 typedef struct _PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate;
 #define _publishing_tumblr_blog_entry_unref0(var) ((var == NULL) ? NULL : (var = (publishing_tumblr_blog_entry_unref (var), NULL)))
 #define _publishing_tumblr_size_entry_unref0(var) ((var == NULL) ? NULL : (var = (publishing_tumblr_size_entry_unref (var), NULL)))
+enum  {
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
+	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+};
+static guint publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
 typedef struct _PublishingTumblrTumblrPublisherTransactionPrivate PublishingTumblrTumblrPublisherTransactionPrivate;
 typedef struct _PublishingTumblrTumblrPublisherAccessTokenFetchTransactionPrivate PublishingTumblrTumblrPublisherAccessTokenFetchTransactionPrivate;
 typedef struct _PublishingTumblrTumblrPublisherUserInfoFetchTransactionPrivate PublishingTumblrTumblrPublisherUserInfoFetchTransactionPrivate;
@@ -381,8 +392,8 @@ static gint tumblr_service_icon_pixbuf_set_length1;
 static GdkPixbuf** tumblr_service_icon_pixbuf_set = NULL;
 static gint tumblr_service_icon_pixbuf_set_length1 = 0;
 static gint _tumblr_service_icon_pixbuf_set_size_ = 0;
-static SpitPluggableIface* tumblr_service_spit_pluggable_parent_iface = NULL;
-static SpitPublishingServiceIface* tumblr_service_spit_publishing_service_parent_iface = NULL;
+static SpitPluggableIface * tumblr_service_spit_pluggable_parent_iface = NULL;
+static SpitPublishingServiceIface * tumblr_service_spit_publishing_service_parent_iface = NULL;
 static gpointer publishing_tumblr_blog_entry_parent_class = NULL;
 static gpointer publishing_tumblr_size_entry_parent_class = NULL;
 static gpointer publishing_tumblr_tumblr_publisher_parent_class = NULL;
@@ -391,16 +402,16 @@ static gchar* publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSA
 static gchar* publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSAGE = NULL;
 static gchar* publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE;
 static gchar* publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE = NULL;
-static SpitPublishingDialogPaneIface* publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_tumblr_tumblr_publisher_transaction_parent_class = NULL;
 static gpointer publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_parent_class = NULL;
 static gpointer publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_parent_class = NULL;
 static gpointer publishing_tumblr_tumblr_publisher_upload_transaction_parent_class = NULL;
 static gpointer publishing_tumblr_tumblr_publisher_uploader_parent_class = NULL;
 static gpointer publishing_tumblr_tumblr_publisher_session_parent_class = NULL;
-static SpitPublishingPublisherIface* publishing_tumblr_tumblr_publisher_spit_publishing_publisher_parent_iface = NULL;
+static SpitPublishingPublisherIface * publishing_tumblr_tumblr_publisher_spit_publishing_publisher_parent_iface = NULL;
 
 GType tumblr_service_get_type (void) G_GNUC_CONST;
 enum  {
@@ -420,7 +431,7 @@ PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_new (SpitPub
 PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
 GType publishing_tumblr_tumblr_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType tumblr_service_real_get_supported_media (SpitPublishingService* base);
-static void tumblr_service_finalize (GObject* obj);
+static void tumblr_service_finalize (GObject * obj);
 #define PUBLISHING_TUMBLR_SERVICE_NAME "Tumblr"
 #define PUBLISHING_TUMBLR_ENDPOINT_URL "https://www.tumblr.com/"
 #define PUBLISHING_TUMBLR_API_KEY "NdXvXQuKVccOsCOj0H4k9HUJcbcjDBYSo2AkaHzXFECHGNuP9k"
@@ -439,7 +450,7 @@ enum  {
 };
 PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_new (const gchar* creator_blog, const gchar* creator_url);
 PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_construct (GType object_type, const gchar* creator_blog, const gchar* creator_url);
-static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry* obj);
+static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry * obj);
 gpointer publishing_tumblr_size_entry_ref (gpointer instance);
 void publishing_tumblr_size_entry_unref (gpointer instance);
 GParamSpec* publishing_tumblr_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -452,7 +463,7 @@ enum  {
 };
 PublishingTumblrSizeEntry* publishing_tumblr_size_entry_new (const gchar* creator_title, gint creator_size);
 PublishingTumblrSizeEntry* publishing_tumblr_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size);
-static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry* obj);
+static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry * obj);
 GType publishing_tumblr_tumblr_publisher_session_get_type (void) G_GNUC_CONST;
 GType publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisherPrivate))
@@ -462,9 +473,9 @@ enum  {
 static void publishing_tumblr_tumblr_publisher_on_session_authenticated (PublishingTumblrTumblrPublisher* self);
 static void _publishing_tumblr_tumblr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self);
 static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_sizes (PublishingTumblrTumblrPublisher* self, int* result_length1);
-static void _vala_array_add18 (PublishingTumblrSizeEntry*** array, int* length, int* size, PublishingTumblrSizeEntry* value);
-static void _vala_array_add19 (PublishingTumblrSizeEntry*** array, int* length, int* size, PublishingTumblrSizeEntry* value);
-static void _vala_array_add20 (PublishingTumblrSizeEntry*** array, int* length, int* size, PublishingTumblrSizeEntry* value);
+static void _vala_array_add18 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value);
+static void _vala_array_add19 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value);
+static void _vala_array_add20 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value);
 static PublishingTumblrBlogEntry** publishing_tumblr_tumblr_publisher_create_blogs (PublishingTumblrTumblrPublisher* self, int* result_length1);
 PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_new (void);
 PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_construct (GType object_type);
@@ -512,7 +523,7 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (Publis
 static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
 static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (PublishingTumblrTumblrPublisher* self, const gchar* response);
 static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (PublishingTumblrTumblrPublisher* self);
-static void _vala_array_add21 (PublishingTumblrBlogEntry*** array, int* length, int* size, PublishingTumblrBlogEntry* value);
+static void _vala_array_add21 (PublishingTumblrBlogEntry** * array, int* length, int* size, PublishingTumblrBlogEntry* value);
 void publishing_tumblr_tumblr_publisher_session_deauthenticate (PublishingTumblrTumblrPublisherSession* self);
 PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_new (PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username);
 PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (GType object_type, PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username);
@@ -554,7 +565,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publishe
 static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
 static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
 static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GObject* obj);
+static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GObject * obj);
 #define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate))
 enum  {
 	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
@@ -579,7 +590,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_p
 static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self);
 static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self);
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject* obj);
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject * obj);
 enum  {
 	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TRANSACTION_DUMMY_PROPERTY
 };
@@ -606,26 +617,26 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ
 PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url);
 PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url);
 void publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (PublishingTumblrTumblrPublisherUploadTransaction* self, const gchar* key, const gchar* value);
-static void _vala_array_add22 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value);
+static void _vala_array_add22 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value);
 PublishingRESTSupportArgument** publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_fields (PublishingTumblrTumblrPublisherUploadTransaction* self, int* result_length1);
 static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportArgument** self, int length);
 gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_string (PublishingTumblrTumblrPublisherUploadTransaction* self);
 static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
-static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (PublishingRESTSupportTransaction* obj);
+static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (PublishingRESTSupportTransaction * obj);
 #define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploaderPrivate))
 enum  {
 	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_DUMMY_PROPERTY
 };
 static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable);
-static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader* obj);
+static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
 #define PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSessionPrivate))
 enum  {
 	PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_DUMMY_PROPERTY
 };
 static gboolean publishing_tumblr_tumblr_publisher_session_real_is_authenticated (PublishingRESTSupportSession* base);
-static void _vala_array_add23 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value);
-static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTSupportSession* obj);
-static void publishing_tumblr_tumblr_publisher_finalize (GObject* obj);
+static void _vala_array_add23 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value);
+static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTSupportSession * obj);
+static void publishing_tumblr_tumblr_publisher_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
@@ -633,8 +644,8 @@ static gint _vala_array_length (gpointer array);
 
 TumblrService* tumblr_service_construct (GType object_type, GFile* resource_directory) {
 	TumblrService * self = NULL;
-	GdkPixbuf** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	GdkPixbuf** _tmp0_;
+	gint _tmp0__length1;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -645,9 +656,9 @@ TumblrService* tumblr_service_construct (GType object_type, GFile* resource_dire
 	_tmp0__length1 = tumblr_service_icon_pixbuf_set_length1;
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 649 "TumblrPublishing.c"
-		gint _tmp1_ = 0;
-		GdkPixbuf** _tmp2_ = NULL;
+#line 660 "TumblrPublishing.c"
+		gint _tmp1_;
+		GdkPixbuf** _tmp2_;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp2_ = resources_load_from_resource (PLUGIN_RESOURCE_PATH "/" TUMBLR_SERVICE_ICON_FILENAME, &_tmp1_);
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -658,27 +669,27 @@ TumblrService* tumblr_service_construct (GType object_type, GFile* resource_dire
 		tumblr_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tumblr_service_icon_pixbuf_set_size_ = tumblr_service_icon_pixbuf_set_length1;
-#line 662 "TumblrPublishing.c"
+#line 673 "TumblrPublishing.c"
 	}
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 666 "TumblrPublishing.c"
+#line 677 "TumblrPublishing.c"
 }
 
 
 TumblrService* tumblr_service_new (GFile* resource_directory) {
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return tumblr_service_construct (TYPE_TUMBLR_SERVICE, resource_directory);
-#line 673 "TumblrPublishing.c"
+#line 684 "TumblrPublishing.c"
 }
 
 
 static gint tumblr_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
 	TumblrService * self;
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -691,7 +702,7 @@ static gint tumblr_service_real_get_pluggable_interface (SpitPluggable* base, gi
 	result = _tmp2_;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 695 "TumblrPublishing.c"
+#line 706 "TumblrPublishing.c"
 }
 
 
@@ -704,7 +715,7 @@ static const gchar* tumblr_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.tumblr";
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 708 "TumblrPublishing.c"
+#line 719 "TumblrPublishing.c"
 }
 
 
@@ -717,14 +728,14 @@ static const gchar* tumblr_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Tumblr";
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 721 "TumblrPublishing.c"
+#line 732 "TumblrPublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 728 "TumblrPublishing.c"
+#line 739 "TumblrPublishing.c"
 }
 
 
@@ -735,34 +746,33 @@ static GdkPixbuf** _vala_array_dup6 (GdkPixbuf** self, int length) {
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 739 "TumblrPublishing.c"
-		GdkPixbuf* _tmp0_ = NULL;
+#line 750 "TumblrPublishing.c"
+		GdkPixbuf* _tmp0_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		result[i] = _tmp0_;
-#line 745 "TumblrPublishing.c"
+#line 756 "TumblrPublishing.c"
 	}
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 749 "TumblrPublishing.c"
+#line 760 "TumblrPublishing.c"
 }
 
 
 static void tumblr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
 	TumblrService * self;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GdkPixbuf** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	GdkPixbuf** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	GdkPixbuf** _tmp7_;
+	gint _tmp7__length1;
+	GdkPixbuf** _tmp8_;
+	gint _tmp8__length1;
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -774,60 +784,58 @@ static void tumblr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*info).authors = _tmp0_;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = _ ("Copyright 2012 BJA Electronics");
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp1_ = g_strdup (_ ("Copyright 2012 BJA Electronics"));
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 ((*info).copyright);
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).copyright = _tmp2_;
+	(*info).copyright = _tmp1_;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = g_strdup (RESOURCES_TRANSLATORS);
+	_tmp2_ = g_strdup (RESOURCES_TRANSLATORS);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 ((*info).translators);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).translators = _tmp3_;
+	(*info).translators = _tmp2_;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = g_strdup (_VERSION);
+	_tmp3_ = g_strdup (_VERSION);
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 ((*info).version);
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).version = _tmp4_;
+	(*info).version = _tmp3_;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME);
+	_tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 ((*info).website_name);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).website_name = _tmp5_;
+	(*info).website_name = _tmp4_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = g_strdup (RESOURCES_WEBSITE_URL);
+	_tmp5_ = g_strdup (RESOURCES_WEBSITE_URL);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 ((*info).website_url);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).website_url = _tmp6_;
+	(*info).website_url = _tmp5_;
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*info).is_license_wordwrapped = FALSE;
 #line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = g_strdup (RESOURCES_LICENSE);
+	_tmp6_ = g_strdup (RESOURCES_LICENSE);
 #line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 ((*info).license);
 #line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).license = _tmp7_;
+	(*info).license = _tmp6_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = tumblr_service_icon_pixbuf_set;
+	_tmp7_ = tumblr_service_icon_pixbuf_set;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8__length1 = tumblr_service_icon_pixbuf_set_length1;
+	_tmp7__length1 = tumblr_service_icon_pixbuf_set_length1;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup6 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup6 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9__length1 = _tmp8__length1;
+	_tmp8__length1 = _tmp7__length1;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).icons = _tmp9_;
+	(*info).icons = _tmp8_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	(*info).icons_length1 = _tmp9__length1;
-#line 831 "TumblrPublishing.c"
+	(*info).icons_length1 = _tmp8__length1;
+#line 839 "TumblrPublishing.c"
 }
 
 
@@ -835,15 +843,15 @@ static void tumblr_service_real_activation (SpitPluggable* base, gboolean enable
 	TumblrService * self;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
-#line 839 "TumblrPublishing.c"
+#line 847 "TumblrPublishing.c"
 }
 
 
 static SpitPublishingPublisher* tumblr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
 	TumblrService * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingTumblrTumblrPublisher* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingTumblrTumblrPublisher* _tmp1_;
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TUMBLR_SERVICE, TumblrService);
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -856,7 +864,7 @@ static SpitPublishingPublisher* tumblr_service_real_create_publisher (SpitPublis
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 860 "TumblrPublishing.c"
+#line 868 "TumblrPublishing.c"
 }
 
 
@@ -869,7 +877,7 @@ static SpitPublishingPublisherMediaType tumblr_service_real_get_supported_media
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 873 "TumblrPublishing.c"
+#line 881 "TumblrPublishing.c"
 }
 
 
@@ -878,7 +886,7 @@ static void tumblr_service_class_init (TumblrServiceClass * klass) {
 	tumblr_service_parent_class = g_type_class_peek_parent (klass);
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = tumblr_service_finalize;
-#line 882 "TumblrPublishing.c"
+#line 890 "TumblrPublishing.c"
 }
 
 
@@ -886,16 +894,16 @@ static void tumblr_service_spit_pluggable_interface_init (SpitPluggableIface * i
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	tumblr_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) tumblr_service_real_get_pluggable_interface;
+	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) tumblr_service_real_get_pluggable_interface;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_id = (const gchar* (*)(SpitPluggable*)) tumblr_service_real_get_id;
+	iface->get_id = (const gchar* (*) (SpitPluggable *)) tumblr_service_real_get_id;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) tumblr_service_real_get_pluggable_name;
+	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) tumblr_service_real_get_pluggable_name;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) tumblr_service_real_get_info;
+	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) tumblr_service_real_get_info;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->activation = (void (*)(SpitPluggable*, gboolean)) tumblr_service_real_activation;
-#line 899 "TumblrPublishing.c"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) tumblr_service_real_activation;
+#line 907 "TumblrPublishing.c"
 }
 
 
@@ -903,10 +911,10 @@ static void tumblr_service_spit_publishing_service_interface_init (SpitPublishin
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	tumblr_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) tumblr_service_real_create_publisher;
+	iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) tumblr_service_real_create_publisher;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) tumblr_service_real_get_supported_media;
-#line 910 "TumblrPublishing.c"
+	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) tumblr_service_real_get_supported_media;
+#line 918 "TumblrPublishing.c"
 }
 
 
@@ -914,13 +922,13 @@ static void tumblr_service_instance_init (TumblrService * self) {
 }
 
 
-static void tumblr_service_finalize (GObject* obj) {
+static void tumblr_service_finalize (GObject * obj) {
 	TumblrService * self;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TUMBLR_SERVICE, TumblrService);
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	G_OBJECT_CLASS (tumblr_service_parent_class)->finalize (obj);
-#line 924 "TumblrPublishing.c"
+#line 932 "TumblrPublishing.c"
 }
 
 
@@ -942,10 +950,10 @@ GType tumblr_service_get_type (void) {
 
 PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_construct (GType object_type, const gchar* creator_blog, const gchar* creator_url) {
 	PublishingTumblrBlogEntry* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (creator_blog != NULL, NULL);
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -970,21 +978,21 @@ PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_construct (GType object_
 	self->url = _tmp3_;
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 974 "TumblrPublishing.c"
+#line 982 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrBlogEntry* publishing_tumblr_blog_entry_new (const gchar* creator_blog, const gchar* creator_url) {
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_blog_entry_construct (PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, creator_blog, creator_url);
-#line 981 "TumblrPublishing.c"
+#line 989 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_value_blog_entry_init (GValue* value) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 988 "TumblrPublishing.c"
+#line 996 "TumblrPublishing.c"
 }
 
 
@@ -993,7 +1001,7 @@ static void publishing_tumblr_value_blog_entry_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_tumblr_blog_entry_unref (value->data[0].v_pointer);
-#line 997 "TumblrPublishing.c"
+#line 1005 "TumblrPublishing.c"
 	}
 }
 
@@ -1003,11 +1011,11 @@ static void publishing_tumblr_value_blog_entry_copy_value (const GValue* src_val
 	if (src_value->data[0].v_pointer) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_tumblr_blog_entry_ref (src_value->data[0].v_pointer);
-#line 1007 "TumblrPublishing.c"
+#line 1015 "TumblrPublishing.c"
 	} else {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1011 "TumblrPublishing.c"
+#line 1019 "TumblrPublishing.c"
 	}
 }
 
@@ -1015,66 +1023,66 @@ static void publishing_tumblr_value_blog_entry_copy_value (const GValue* src_val
 static gpointer publishing_tumblr_value_blog_entry_peek_pointer (const GValue* value) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1019 "TumblrPublishing.c"
+#line 1027 "TumblrPublishing.c"
 }
 
 
 static gchar* publishing_tumblr_value_blog_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1026 "TumblrPublishing.c"
-		PublishingTumblrBlogEntry* object;
+#line 1034 "TumblrPublishing.c"
+		PublishingTumblrBlogEntry * object;
 		object = collect_values[0].v_pointer;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1033 "TumblrPublishing.c"
+#line 1041 "TumblrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1037 "TumblrPublishing.c"
+#line 1045 "TumblrPublishing.c"
 		}
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = publishing_tumblr_blog_entry_ref (object);
-#line 1041 "TumblrPublishing.c"
+#line 1049 "TumblrPublishing.c"
 	} else {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1045 "TumblrPublishing.c"
+#line 1053 "TumblrPublishing.c"
 	}
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return NULL;
-#line 1049 "TumblrPublishing.c"
+#line 1057 "TumblrPublishing.c"
 }
 
 
 static gchar* publishing_tumblr_value_blog_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingTumblrBlogEntry** object_p;
+	PublishingTumblrBlogEntry ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (!object_p) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1060 "TumblrPublishing.c"
+#line 1068 "TumblrPublishing.c"
 	}
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*object_p = NULL;
-#line 1066 "TumblrPublishing.c"
+#line 1074 "TumblrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1070 "TumblrPublishing.c"
+#line 1078 "TumblrPublishing.c"
 	} else {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*object_p = publishing_tumblr_blog_entry_ref (value->data[0].v_pointer);
-#line 1074 "TumblrPublishing.c"
+#line 1082 "TumblrPublishing.c"
 	}
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return NULL;
-#line 1078 "TumblrPublishing.c"
+#line 1086 "TumblrPublishing.c"
 }
 
 
@@ -1088,7 +1096,7 @@ GParamSpec* publishing_tumblr_param_spec_blog_entry (const gchar* name, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1092 "TumblrPublishing.c"
+#line 1100 "TumblrPublishing.c"
 }
 
 
@@ -1097,12 +1105,12 @@ gpointer publishing_tumblr_value_get_blog_entry (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY), NULL);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1101 "TumblrPublishing.c"
+#line 1109 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_value_set_blog_entry (GValue* value, gpointer v_object) {
-	PublishingTumblrBlogEntry* old;
+	PublishingTumblrBlogEntry * old;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1117,23 +1125,23 @@ void publishing_tumblr_value_set_blog_entry (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_tumblr_blog_entry_ref (value->data[0].v_pointer);
-#line 1121 "TumblrPublishing.c"
+#line 1129 "TumblrPublishing.c"
 	} else {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1125 "TumblrPublishing.c"
+#line 1133 "TumblrPublishing.c"
 	}
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (old) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_tumblr_blog_entry_unref (old);
-#line 1131 "TumblrPublishing.c"
+#line 1139 "TumblrPublishing.c"
 	}
 }
 
 
 void publishing_tumblr_value_take_blog_entry (GValue* value, gpointer v_object) {
-	PublishingTumblrBlogEntry* old;
+	PublishingTumblrBlogEntry * old;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY));
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1146,17 +1154,17 @@ void publishing_tumblr_value_take_blog_entry (GValue* value, gpointer v_object)
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1150 "TumblrPublishing.c"
+#line 1158 "TumblrPublishing.c"
 	} else {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1154 "TumblrPublishing.c"
+#line 1162 "TumblrPublishing.c"
 	}
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (old) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_tumblr_blog_entry_unref (old);
-#line 1160 "TumblrPublishing.c"
+#line 1168 "TumblrPublishing.c"
 	}
 }
 
@@ -1166,18 +1174,18 @@ static void publishing_tumblr_blog_entry_class_init (PublishingTumblrBlogEntryCl
 	publishing_tumblr_blog_entry_parent_class = g_type_class_peek_parent (klass);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	((PublishingTumblrBlogEntryClass *) klass)->finalize = publishing_tumblr_blog_entry_finalize;
-#line 1170 "TumblrPublishing.c"
+#line 1178 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_blog_entry_instance_init (PublishingTumblrBlogEntry * self) {
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->ref_count = 1;
-#line 1177 "TumblrPublishing.c"
+#line 1185 "TumblrPublishing.c"
 }
 
 
-static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry* obj) {
+static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry * obj) {
 	PublishingTumblrBlogEntry * self;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_BLOG_ENTRY, PublishingTumblrBlogEntry);
@@ -1187,7 +1195,7 @@ static void publishing_tumblr_blog_entry_finalize (PublishingTumblrBlogEntry* ob
 	_g_free0 (self->blog);
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (self->url);
-#line 1191 "TumblrPublishing.c"
+#line 1199 "TumblrPublishing.c"
 }
 
 
@@ -1206,18 +1214,18 @@ GType publishing_tumblr_blog_entry_get_type (void) {
 
 
 gpointer publishing_tumblr_blog_entry_ref (gpointer instance) {
-	PublishingTumblrBlogEntry* self;
+	PublishingTumblrBlogEntry * self;
 	self = instance;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return instance;
-#line 1216 "TumblrPublishing.c"
+#line 1224 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_blog_entry_unref (gpointer instance) {
-	PublishingTumblrBlogEntry* self;
+	PublishingTumblrBlogEntry * self;
 	self = instance;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1225,16 +1233,16 @@ void publishing_tumblr_blog_entry_unref (gpointer instance) {
 		PUBLISHING_TUMBLR_BLOG_ENTRY_GET_CLASS (self)->finalize (self);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1229 "TumblrPublishing.c"
+#line 1237 "TumblrPublishing.c"
 	}
 }
 
 
 PublishingTumblrSizeEntry* publishing_tumblr_size_entry_construct (GType object_type, const gchar* creator_title, gint creator_size) {
 	PublishingTumblrSizeEntry* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	gint _tmp2_;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (creator_title != NULL, NULL);
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1253,21 +1261,21 @@ PublishingTumblrSizeEntry* publishing_tumblr_size_entry_construct (GType object_
 	self->size = _tmp2_;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 1257 "TumblrPublishing.c"
+#line 1265 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrSizeEntry* publishing_tumblr_size_entry_new (const gchar* creator_title, gint creator_size) {
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_size_entry_construct (PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, creator_title, creator_size);
-#line 1264 "TumblrPublishing.c"
+#line 1272 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_value_size_entry_init (GValue* value) {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1271 "TumblrPublishing.c"
+#line 1279 "TumblrPublishing.c"
 }
 
 
@@ -1276,7 +1284,7 @@ static void publishing_tumblr_value_size_entry_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_tumblr_size_entry_unref (value->data[0].v_pointer);
-#line 1280 "TumblrPublishing.c"
+#line 1288 "TumblrPublishing.c"
 	}
 }
 
@@ -1286,11 +1294,11 @@ static void publishing_tumblr_value_size_entry_copy_value (const GValue* src_val
 	if (src_value->data[0].v_pointer) {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_tumblr_size_entry_ref (src_value->data[0].v_pointer);
-#line 1290 "TumblrPublishing.c"
+#line 1298 "TumblrPublishing.c"
 	} else {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1294 "TumblrPublishing.c"
+#line 1302 "TumblrPublishing.c"
 	}
 }
 
@@ -1298,66 +1306,66 @@ static void publishing_tumblr_value_size_entry_copy_value (const GValue* src_val
 static gpointer publishing_tumblr_value_size_entry_peek_pointer (const GValue* value) {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1302 "TumblrPublishing.c"
+#line 1310 "TumblrPublishing.c"
 }
 
 
 static gchar* publishing_tumblr_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1309 "TumblrPublishing.c"
-		PublishingTumblrSizeEntry* object;
+#line 1317 "TumblrPublishing.c"
+		PublishingTumblrSizeEntry * object;
 		object = collect_values[0].v_pointer;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1316 "TumblrPublishing.c"
+#line 1324 "TumblrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1320 "TumblrPublishing.c"
+#line 1328 "TumblrPublishing.c"
 		}
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = publishing_tumblr_size_entry_ref (object);
-#line 1324 "TumblrPublishing.c"
+#line 1332 "TumblrPublishing.c"
 	} else {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1328 "TumblrPublishing.c"
+#line 1336 "TumblrPublishing.c"
 	}
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return NULL;
-#line 1332 "TumblrPublishing.c"
+#line 1340 "TumblrPublishing.c"
 }
 
 
 static gchar* publishing_tumblr_value_size_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingTumblrSizeEntry** object_p;
+	PublishingTumblrSizeEntry ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (!object_p) {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1343 "TumblrPublishing.c"
+#line 1351 "TumblrPublishing.c"
 	}
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*object_p = NULL;
-#line 1349 "TumblrPublishing.c"
+#line 1357 "TumblrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1353 "TumblrPublishing.c"
+#line 1361 "TumblrPublishing.c"
 	} else {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*object_p = publishing_tumblr_size_entry_ref (value->data[0].v_pointer);
-#line 1357 "TumblrPublishing.c"
+#line 1365 "TumblrPublishing.c"
 	}
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return NULL;
-#line 1361 "TumblrPublishing.c"
+#line 1369 "TumblrPublishing.c"
 }
 
 
@@ -1371,7 +1379,7 @@ GParamSpec* publishing_tumblr_param_spec_size_entry (const gchar* name, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1375 "TumblrPublishing.c"
+#line 1383 "TumblrPublishing.c"
 }
 
 
@@ -1380,12 +1388,12 @@ gpointer publishing_tumblr_value_get_size_entry (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY), NULL);
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1384 "TumblrPublishing.c"
+#line 1392 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_value_set_size_entry (GValue* value, gpointer v_object) {
-	PublishingTumblrSizeEntry* old;
+	PublishingTumblrSizeEntry * old;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1400,23 +1408,23 @@ void publishing_tumblr_value_set_size_entry (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_tumblr_size_entry_ref (value->data[0].v_pointer);
-#line 1404 "TumblrPublishing.c"
+#line 1412 "TumblrPublishing.c"
 	} else {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1408 "TumblrPublishing.c"
+#line 1416 "TumblrPublishing.c"
 	}
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (old) {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_tumblr_size_entry_unref (old);
-#line 1414 "TumblrPublishing.c"
+#line 1422 "TumblrPublishing.c"
 	}
 }
 
 
 void publishing_tumblr_value_take_size_entry (GValue* value, gpointer v_object) {
-	PublishingTumblrSizeEntry* old;
+	PublishingTumblrSizeEntry * old;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY));
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1429,17 +1437,17 @@ void publishing_tumblr_value_take_size_entry (GValue* value, gpointer v_object)
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1433 "TumblrPublishing.c"
+#line 1441 "TumblrPublishing.c"
 	} else {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1437 "TumblrPublishing.c"
+#line 1445 "TumblrPublishing.c"
 	}
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (old) {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_tumblr_size_entry_unref (old);
-#line 1443 "TumblrPublishing.c"
+#line 1451 "TumblrPublishing.c"
 	}
 }
 
@@ -1449,18 +1457,18 @@ static void publishing_tumblr_size_entry_class_init (PublishingTumblrSizeEntryCl
 	publishing_tumblr_size_entry_parent_class = g_type_class_peek_parent (klass);
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	((PublishingTumblrSizeEntryClass *) klass)->finalize = publishing_tumblr_size_entry_finalize;
-#line 1453 "TumblrPublishing.c"
+#line 1461 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_size_entry_instance_init (PublishingTumblrSizeEntry * self) {
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->ref_count = 1;
-#line 1460 "TumblrPublishing.c"
+#line 1468 "TumblrPublishing.c"
 }
 
 
-static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry* obj) {
+static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry * obj) {
 	PublishingTumblrSizeEntry * self;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_SIZE_ENTRY, PublishingTumblrSizeEntry);
@@ -1468,7 +1476,7 @@ static void publishing_tumblr_size_entry_finalize (PublishingTumblrSizeEntry* ob
 	g_signal_handlers_destroy (self);
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (self->title);
-#line 1472 "TumblrPublishing.c"
+#line 1480 "TumblrPublishing.c"
 }
 
 
@@ -1487,18 +1495,18 @@ GType publishing_tumblr_size_entry_get_type (void) {
 
 
 gpointer publishing_tumblr_size_entry_ref (gpointer instance) {
-	PublishingTumblrSizeEntry* self;
+	PublishingTumblrSizeEntry * self;
 	self = instance;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return instance;
-#line 1497 "TumblrPublishing.c"
+#line 1505 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_size_entry_unref (gpointer instance) {
-	PublishingTumblrSizeEntry* self;
+	PublishingTumblrSizeEntry * self;
 	self = instance;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1506,7 +1514,7 @@ void publishing_tumblr_size_entry_unref (gpointer instance) {
 		PUBLISHING_TUMBLR_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1510 "TumblrPublishing.c"
+#line 1518 "TumblrPublishing.c"
 	}
 }
 
@@ -1514,81 +1522,78 @@ void publishing_tumblr_size_entry_unref (gpointer instance) {
 static void _publishing_tumblr_tumblr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self) {
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_session_authenticated ((PublishingTumblrTumblrPublisher*) self);
-#line 1518 "TumblrPublishing.c"
+#line 1526 "TumblrPublishing.c"
 }
 
 
-static void _vala_array_add18 (PublishingTumblrSizeEntry*** array, int* length, int* size, PublishingTumblrSizeEntry* value) {
+static void _vala_array_add18 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
-#line 1529 "TumblrPublishing.c"
+#line 1537 "TumblrPublishing.c"
 	}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 1535 "TumblrPublishing.c"
+#line 1543 "TumblrPublishing.c"
 }
 
 
-static void _vala_array_add19 (PublishingTumblrSizeEntry*** array, int* length, int* size, PublishingTumblrSizeEntry* value) {
+static void _vala_array_add19 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) {
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
-#line 1546 "TumblrPublishing.c"
+#line 1554 "TumblrPublishing.c"
 	}
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 1552 "TumblrPublishing.c"
+#line 1560 "TumblrPublishing.c"
 }
 
 
-static void _vala_array_add20 (PublishingTumblrSizeEntry*** array, int* length, int* size, PublishingTumblrSizeEntry* value) {
+static void _vala_array_add20 (PublishingTumblrSizeEntry** * array, int* length, int* size, PublishingTumblrSizeEntry* value) {
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*array = g_renew (PublishingTumblrSizeEntry*, *array, (*size) + 1);
-#line 1563 "TumblrPublishing.c"
+#line 1571 "TumblrPublishing.c"
 	}
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 1569 "TumblrPublishing.c"
+#line 1577 "TumblrPublishing.c"
 }
 
 
 static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_sizes (PublishingTumblrTumblrPublisher* self, int* result_length1) {
 	PublishingTumblrSizeEntry** result = NULL;
 	PublishingTumblrSizeEntry** _result_ = NULL;
-	PublishingTumblrSizeEntry** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	PublishingTumblrSizeEntry** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	PublishingTumblrSizeEntry* _tmp3_ = NULL;
-	PublishingTumblrSizeEntry** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	const gchar* _tmp5_ = NULL;
-	PublishingTumblrSizeEntry* _tmp6_ = NULL;
-	PublishingTumblrSizeEntry** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	const gchar* _tmp8_ = NULL;
-	PublishingTumblrSizeEntry* _tmp9_ = NULL;
-	PublishingTumblrSizeEntry** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	PublishingTumblrSizeEntry** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	PublishingTumblrSizeEntry** _tmp1_;
+	gint _tmp1__length1;
+	PublishingTumblrSizeEntry* _tmp2_;
+	PublishingTumblrSizeEntry** _tmp3_;
+	gint _tmp3__length1;
+	PublishingTumblrSizeEntry* _tmp4_;
+	PublishingTumblrSizeEntry** _tmp5_;
+	gint _tmp5__length1;
+	PublishingTumblrSizeEntry* _tmp6_;
+	PublishingTumblrSizeEntry** _tmp7_;
+	gint _tmp7__length1;
 #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
 #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1604,57 +1609,51 @@ static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_siz
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1__length1 = _result__length1;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = _ ("500 × 375 pixels");
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = publishing_tumblr_size_entry_new (_tmp2_, 500);
+	_tmp2_ = publishing_tumblr_size_entry_new (_ ("500 × 375 pixels"), 500);
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp3_);
+	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4_ = _result_;
+	_tmp3_ = _result_;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp4__length1 = _result__length1;
+	_tmp3__length1 = _result__length1;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp5_ = _ ("1024 × 768 pixels");
+	_tmp4_ = publishing_tumblr_size_entry_new (_ ("1024 × 768 pixels"), 1024);
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp6_ = publishing_tumblr_size_entry_new (_tmp5_, 1024);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7_ = _result_;
+	_tmp5_ = _result_;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp7__length1 = _result__length1;
+	_tmp5__length1 = _result__length1;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp8_ = _ ("1280 × 853 pixels");
+	_tmp6_ = publishing_tumblr_size_entry_new (_ ("1280 × 853 pixels"), 1280);
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp9_ = publishing_tumblr_size_entry_new (_tmp8_, 1280);
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp9_);
+	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp10_ = _result_;
+	_tmp7_ = _result_;
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp10__length1 = _result__length1;
+	_tmp7__length1 = _result__length1;
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (result_length1) {
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		*result_length1 = _tmp10__length1;
-#line 1641 "TumblrPublishing.c"
+		*result_length1 = _tmp7__length1;
+#line 1640 "TumblrPublishing.c"
 	}
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	result = _tmp10_;
+	result = _tmp7_;
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 1647 "TumblrPublishing.c"
+#line 1646 "TumblrPublishing.c"
 }
 
 
 static PublishingTumblrBlogEntry** publishing_tumblr_tumblr_publisher_create_blogs (PublishingTumblrTumblrPublisher* self, int* result_length1) {
 	PublishingTumblrBlogEntry** result = NULL;
 	PublishingTumblrBlogEntry** _result_ = NULL;
-	PublishingTumblrBlogEntry** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	PublishingTumblrBlogEntry** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	PublishingTumblrBlogEntry** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
+	PublishingTumblrBlogEntry** _tmp1_;
+	gint _tmp1__length1;
 #line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1673,28 +1672,28 @@ static PublishingTumblrBlogEntry** publishing_tumblr_tumblr_publisher_create_blo
 	if (result_length1) {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*result_length1 = _tmp1__length1;
-#line 1677 "TumblrPublishing.c"
+#line 1676 "TumblrPublishing.c"
 	}
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = _tmp1_;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 1683 "TumblrPublishing.c"
+#line 1682 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
 	PublishingTumblrTumblrPublisher * self = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingService* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-	SpitPublishingPluginHost* _tmp3_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	PublishingTumblrSizeEntry** _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	PublishingTumblrBlogEntry** _tmp8_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp9_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingService* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
+	PublishingTumblrTumblrPublisherSession* _tmp4_;
+	gint _tmp5_;
+	PublishingTumblrSizeEntry** _tmp6_;
+	gint _tmp7_;
+	PublishingTumblrBlogEntry** _tmp8_;
+	PublishingTumblrTumblrPublisherSession* _tmp9_;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1751,14 +1750,14 @@ PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_construct (G
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated", (GCallback) _publishing_tumblr_tumblr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated, self, 0);
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 1755 "TumblrPublishing.c"
+#line 1754 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisher* publishing_tumblr_tumblr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_construct (PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, service, host);
-#line 1762 "TumblrPublishing.c"
+#line 1761 "TumblrPublishing.c"
 }
 
 
@@ -1769,15 +1768,15 @@ static void publishing_tumblr_tumblr_publisher_invalidate_persistent_session (Pu
 	publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token (self, "");
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token_secret (self, "");
-#line 1773 "TumblrPublishing.c"
+#line 1772 "TumblrPublishing.c"
 }
 
 
 static SpitPublishingService* publishing_tumblr_tumblr_publisher_real_get_service (SpitPublishingPublisher* base) {
 	PublishingTumblrTumblrPublisher * self;
 	SpitPublishingService* result = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingService* _tmp1_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingService* _tmp1_;
 #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1788,14 +1787,14 @@ static SpitPublishingService* publishing_tumblr_tumblr_publisher_real_get_servic
 	result = _tmp1_;
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 1792 "TumblrPublishing.c"
+#line 1791 "TumblrPublishing.c"
 }
 
 
 SpitPublishingPluginHost* publishing_tumblr_tumblr_publisher_get_host (PublishingTumblrTumblrPublisher* self) {
 	SpitPublishingPluginHost* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1806,14 +1805,14 @@ SpitPublishingPluginHost* publishing_tumblr_tumblr_publisher_get_host (Publishin
 	result = _tmp1_;
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 1810 "TumblrPublishing.c"
+#line 1809 "TumblrPublishing.c"
 }
 
 
 static gboolean publishing_tumblr_tumblr_publisher_real_is_running (SpitPublishingPublisher* base) {
 	PublishingTumblrTumblrPublisher * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
 #line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1822,20 +1821,20 @@ static gboolean publishing_tumblr_tumblr_publisher_real_is_running (SpitPublishi
 	result = _tmp0_;
 #line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 1826 "TumblrPublishing.c"
+#line 1825 "TumblrPublishing.c"
 }
 
 
 static gboolean publishing_tumblr_tumblr_publisher_is_persistent_session_valid (PublishingTumblrTumblrPublisher* self) {
 	gboolean result = FALSE;
 	gchar* access_phase_token = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 	gchar* access_phase_token_secret = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp1_;
 	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp3_;
 	gboolean valid = FALSE;
-	gboolean _tmp5_ = FALSE;
+	gboolean _tmp5_;
 #line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), FALSE);
 #line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1850,17 +1849,17 @@ static gboolean publishing_tumblr_tumblr_publisher_is_persistent_session_valid (
 	_tmp3_ = access_phase_token;
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp3_ != NULL) {
-#line 1854 "TumblrPublishing.c"
-		const gchar* _tmp4_ = NULL;
+#line 1853 "TumblrPublishing.c"
+		const gchar* _tmp4_;
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp4_ = access_phase_token_secret;
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp2_ = _tmp4_ != NULL;
-#line 1860 "TumblrPublishing.c"
+#line 1859 "TumblrPublishing.c"
 	} else {
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp2_ = FALSE;
-#line 1864 "TumblrPublishing.c"
+#line 1863 "TumblrPublishing.c"
 	}
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	valid = _tmp2_;
@@ -1871,11 +1870,11 @@ static gboolean publishing_tumblr_tumblr_publisher_is_persistent_session_valid (
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_debug ("TumblrPublishing.vala:163: existing Tumblr session found in configurat" \
 "ion database; using it.");
-#line 1874 "TumblrPublishing.c"
+#line 1873 "TumblrPublishing.c"
 	} else {
 #line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_debug ("TumblrPublishing.vala:165: no persisted Tumblr session exists.");
-#line 1878 "TumblrPublishing.c"
+#line 1877 "TumblrPublishing.c"
 	}
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = valid;
@@ -1885,14 +1884,14 @@ static gboolean publishing_tumblr_tumblr_publisher_is_persistent_session_valid (
 	_g_free0 (access_phase_token);
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 1888 "TumblrPublishing.c"
+#line 1887 "TumblrPublishing.c"
 }
 
 
 gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token (PublishingTumblrTumblrPublisher* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1903,13 +1902,13 @@ gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token (Pub
 	result = _tmp1_;
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 1906 "TumblrPublishing.c"
+#line 1905 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token (PublishingTumblrTumblrPublisher* self, const gchar* token) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	const gchar* _tmp1_;
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1918,14 +1917,14 @@ static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token
 	_tmp1_ = token;
 #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "token", _tmp1_);
-#line 1921 "TumblrPublishing.c"
+#line 1920 "TumblrPublishing.c"
 }
 
 
 gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token_secret (PublishingTumblrTumblrPublisher* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), NULL);
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1936,13 +1935,13 @@ gchar* publishing_tumblr_tumblr_publisher_get_persistent_access_phase_token_secr
 	result = _tmp1_;
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 1939 "TumblrPublishing.c"
+#line 1938 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token_secret (PublishingTumblrTumblrPublisher* self, const gchar* token_secret) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	const gchar* _tmp1_;
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1951,14 +1950,14 @@ static void publishing_tumblr_tumblr_publisher_set_persistent_access_phase_token
 	_tmp1_ = token_secret;
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "token_secret", _tmp1_);
-#line 1954 "TumblrPublishing.c"
+#line 1953 "TumblrPublishing.c"
 }
 
 
 gint publishing_tumblr_tumblr_publisher_get_persistent_default_size (PublishingTumblrTumblrPublisher* self) {
 	gint result = 0;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), 0);
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1969,13 +1968,13 @@ gint publishing_tumblr_tumblr_publisher_get_persistent_default_size (PublishingT
 	result = _tmp1_;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 1972 "TumblrPublishing.c"
+#line 1971 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_tumblr_publisher_set_persistent_default_size (PublishingTumblrTumblrPublisher* self, gint size) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1984,14 +1983,14 @@ void publishing_tumblr_tumblr_publisher_set_persistent_default_size (PublishingT
 	_tmp1_ = size;
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", _tmp1_);
-#line 1987 "TumblrPublishing.c"
+#line 1986 "TumblrPublishing.c"
 }
 
 
 gint publishing_tumblr_tumblr_publisher_get_persistent_default_blog (PublishingTumblrTumblrPublisher* self) {
 	gint result = 0;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self), 0);
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2002,13 +2001,13 @@ gint publishing_tumblr_tumblr_publisher_get_persistent_default_blog (PublishingT
 	result = _tmp1_;
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 2005 "TumblrPublishing.c"
+#line 2004 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingTumblrTumblrPublisher* self, gint blog) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
+	SpitPublishingPluginHost* _tmp0_;
+	gint _tmp1_;
 #line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2017,7 +2016,7 @@ void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingT
 	_tmp1_ = blog;
 #line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_blog", _tmp1_);
-#line 2020 "TumblrPublishing.c"
+#line 2019 "TumblrPublishing.c"
 }
 
 
@@ -2035,19 +2034,19 @@ void publishing_tumblr_tumblr_publisher_set_persistent_default_blog (PublishingT
 static void _publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked_publishing_tumblr_tumblr_publisher_authentication_pane_login (PublishingTumblrTumblrPublisherAuthenticationPane* _sender, const gchar* user, const gchar* password, gpointer self) {
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked ((PublishingTumblrTumblrPublisher*) self, user, password);
-#line 2038 "TumblrPublishing.c"
+#line 2037 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_do_show_authentication_pane (PublishingTumblrTumblrPublisher* self, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 	PublishingTumblrTumblrPublisherAuthenticationPane* authentication_pane = NULL;
-	PublishingTumblrTumblrPublisherAuthenticationPaneMode _tmp1_ = 0;
-	PublishingTumblrTumblrPublisherAuthenticationPane* _tmp2_ = NULL;
-	SpitPublishingPluginHost* _tmp3_ = NULL;
-	SpitPublishingPluginHost* _tmp4_ = NULL;
-	GtkWidget* _tmp5_ = NULL;
-	GtkWidget* _tmp6_ = NULL;
+	PublishingTumblrTumblrPublisherAuthenticationPaneMode _tmp1_;
+	PublishingTumblrTumblrPublisherAuthenticationPane* _tmp2_;
+	SpitPublishingPluginHost* _tmp3_;
+	SpitPublishingPluginHost* _tmp4_;
+	GtkWidget* _tmp5_;
+	GtkWidget* _tmp6_;
 #line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2080,7 +2079,7 @@ static void publishing_tumblr_tumblr_publisher_do_show_authentication_pane (Publ
 	_g_object_unref0 (_tmp6_);
 #line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_object_unref0 (authentication_pane);
-#line 2083 "TumblrPublishing.c"
+#line 2082 "TumblrPublishing.c"
 }
 
 
@@ -2095,9 +2094,9 @@ static void publishing_tumblr_tumblr_publisher_do_show_authentication_pane (Publ
      * @param password the password of the Tumblr as entered in the dialog
      */
 static void publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clicked (PublishingTumblrTumblrPublisher* self, const gchar* username, const gchar* password) {
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	gboolean _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
 #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2112,7 +2111,7 @@ static void publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clic
 	if (!_tmp0_) {
 #line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 2115 "TumblrPublishing.c"
+#line 2114 "TumblrPublishing.c"
 	}
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = username;
@@ -2120,7 +2119,7 @@ static void publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clic
 	_tmp2_ = password;
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_do_network_login (self, _tmp1_, _tmp2_);
-#line 2123 "TumblrPublishing.c"
+#line 2122 "TumblrPublishing.c"
 }
 
 
@@ -2135,25 +2134,25 @@ static void publishing_tumblr_tumblr_publisher_on_authentication_pane_login_clic
 static void _publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed ((PublishingTumblrTumblrPublisher*) self, _sender);
-#line 2138 "TumblrPublishing.c"
+#line 2137 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_auth_request_txn_error ((PublishingTumblrTumblrPublisher*) self, _sender, err);
-#line 2145 "TumblrPublishing.c"
+#line 2144 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumblrTumblrPublisher* self, const gchar* username, const gchar* password) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 	PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* txn = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* _tmp5_ = NULL;
+	PublishingTumblrTumblrPublisherSession* _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
@@ -2185,7 +2184,7 @@ static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumbl
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_tumblr_tumblr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 2188 "TumblrPublishing.c"
+#line 2187 "TumblrPublishing.c"
 	{
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -2193,7 +2192,7 @@ static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumbl
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2196 "TumblrPublishing.c"
+#line 2195 "TumblrPublishing.c"
 				goto __catch32_spit_publishing_publishing_error;
 			}
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2204,15 +2203,15 @@ static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumbl
 			g_clear_error (&_inner_error_);
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 2207 "TumblrPublishing.c"
+#line 2206 "TumblrPublishing.c"
 		}
 	}
 	goto __finally32;
 	__catch32_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
+		SpitPublishingPluginHost* _tmp6_;
+		GError* _tmp7_;
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		err = _inner_error_;
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2225,7 +2224,7 @@ static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumbl
 		spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_error_free0 (err);
-#line 2228 "TumblrPublishing.c"
+#line 2227 "TumblrPublishing.c"
 	}
 	__finally32:
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2238,26 +2237,26 @@ static void publishing_tumblr_tumblr_publisher_do_network_login (PublishingTumbl
 		g_clear_error (&_inner_error_);
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 2241 "TumblrPublishing.c"
+#line 2240 "TumblrPublishing.c"
 	}
 #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 2245 "TumblrPublishing.c"
+#line 2244 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	PublishingRESTSupportTransaction* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingRESTSupportTransaction* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	PublishingRESTSupportTransaction* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
 #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2280,7 +2279,7 @@ static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed (Pu
 	if (!_tmp4_) {
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 2283 "TumblrPublishing.c"
+#line 2282 "TumblrPublishing.c"
 	}
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = txn;
@@ -2303,18 +2302,18 @@ static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_completed (Pu
 	publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_request (self, _tmp10_);
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (_tmp10_);
-#line 2305 "TumblrPublishing.c"
+#line 2304 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	SpitPublishingPluginHost* _tmp5_ = NULL;
-	GError* _tmp6_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	SpitPublishingPluginHost* _tmp5_;
+	GError* _tmp6_;
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2337,7 +2336,7 @@ static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_error (Publis
 	if (!_tmp4_) {
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 2339 "TumblrPublishing.c"
+#line 2338 "TumblrPublishing.c"
 	}
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_debug ("TumblrPublishing.vala:294: EVENT: OAuth authentication request transac" \
@@ -2348,27 +2347,27 @@ static void publishing_tumblr_tumblr_publisher_on_auth_request_txn_error (Publis
 	_tmp6_ = err;
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 2349 "TumblrPublishing.c"
+#line 2348 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_request (PublishingTumblrTumblrPublisher* self, const gchar* response) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gchar* oauth_token = NULL;
 	gchar* oauth_token_secret = NULL;
 	gchar** key_value_pairs = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint key_value_pairs_length1 = 0;
-	gint _key_value_pairs_size_ = 0;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	gboolean _tmp25_ = FALSE;
-	const gchar* _tmp26_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp33_ = NULL;
-	const gchar* _tmp34_ = NULL;
-	const gchar* _tmp35_ = NULL;
+	const gchar* _tmp1_;
+	gchar** _tmp2_;
+	gchar** _tmp3_;
+	gint key_value_pairs_length1;
+	gint _key_value_pairs_size_;
+	gchar** _tmp4_;
+	gint _tmp4__length1;
+	gboolean _tmp24_ = FALSE;
+	const gchar* _tmp25_;
+	PublishingTumblrTumblrPublisherSession* _tmp31_;
+	const gchar* _tmp32_;
+	const gchar* _tmp33_;
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2396,7 +2395,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req
 	_tmp4_ = key_value_pairs;
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp4__length1 = key_value_pairs_length1;
-#line 2396 "TumblrPublishing.c"
+#line 2395 "TumblrPublishing.c"
 	{
 		gchar** pair_collection = NULL;
 		gint pair_collection_length1 = 0;
@@ -2408,26 +2407,26 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req
 		pair_collection_length1 = _tmp4__length1;
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		for (pair_it = 0; pair_it < _tmp4__length1; pair_it = pair_it + 1) {
-#line 2408 "TumblrPublishing.c"
-			gchar* _tmp5_ = NULL;
+#line 2407 "TumblrPublishing.c"
+			gchar* _tmp5_;
 			gchar* pair = NULL;
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_tmp5_ = g_strdup (pair_collection[pair_it]);
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			pair = _tmp5_;
-#line 2415 "TumblrPublishing.c"
+#line 2414 "TumblrPublishing.c"
 			{
 				gchar** split_pair = NULL;
-				const gchar* _tmp6_ = NULL;
-				gchar** _tmp7_ = NULL;
-				gchar** _tmp8_ = NULL;
-				gint split_pair_length1 = 0;
-				gint _split_pair_size_ = 0;
-				gchar** _tmp9_ = NULL;
-				gint _tmp9__length1 = 0;
-				gchar** _tmp15_ = NULL;
-				gint _tmp15__length1 = 0;
-				const gchar* _tmp16_ = NULL;
+				const gchar* _tmp6_;
+				gchar** _tmp7_;
+				gchar** _tmp8_;
+				gint split_pair_length1;
+				gint _split_pair_size_;
+				gchar** _tmp9_;
+				gint _tmp9__length1;
+				gchar** _tmp14_;
+				gint _tmp14__length1;
+				const gchar* _tmp15_;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp6_ = pair;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2444,159 +2443,153 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req
 				_tmp9__length1 = split_pair_length1;
 #line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (_tmp9__length1 != 2) {
-#line 2444 "TumblrPublishing.c"
-					SpitPublishingPluginHost* _tmp10_ = NULL;
-					const gchar* _tmp11_ = NULL;
-					const gchar* _tmp12_ = NULL;
-					GError* _tmp13_ = NULL;
-					GError* _tmp14_ = NULL;
+#line 2443 "TumblrPublishing.c"
+					SpitPublishingPluginHost* _tmp10_;
+					const gchar* _tmp11_;
+					GError* _tmp12_;
+					GError* _tmp13_;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp10_ = self->priv->host;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp11_ = _ ("“%s” isn’t a valid response to an OAuth authentication request");
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp12_ = response;
+					_tmp11_ = response;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp13_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp11_, _tmp12_);
+					_tmp12_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _ ("“%s” isn’t a valid response to an OAuth authentication request"), _tmp11_);
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp14_ = _tmp13_;
+					_tmp13_ = _tmp12_;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					spit_publishing_plugin_host_post_error (_tmp10_, _tmp14_);
+					spit_publishing_plugin_host_post_error (_tmp10_, _tmp13_);
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_error_free0 (_tmp14_);
-#line 2464 "TumblrPublishing.c"
+					_g_error_free0 (_tmp13_);
+#line 2460 "TumblrPublishing.c"
 				}
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp15_ = split_pair;
+				_tmp14_ = split_pair;
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp15__length1 = split_pair_length1;
+				_tmp14__length1 = split_pair_length1;
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp16_ = _tmp15_[0];
+				_tmp15_ = _tmp14_[0];
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (g_strcmp0 (_tmp16_, "oauth_token") == 0) {
-#line 2474 "TumblrPublishing.c"
-					gchar** _tmp17_ = NULL;
-					gint _tmp17__length1 = 0;
-					const gchar* _tmp18_ = NULL;
-					gchar* _tmp19_ = NULL;
+				if (g_strcmp0 (_tmp15_, "oauth_token") == 0) {
+#line 2470 "TumblrPublishing.c"
+					gchar** _tmp16_;
+					gint _tmp16__length1;
+					const gchar* _tmp17_;
+					gchar* _tmp18_;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp17_ = split_pair;
+					_tmp16_ = split_pair;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp17__length1 = split_pair_length1;
+					_tmp16__length1 = split_pair_length1;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp18_ = _tmp17_[1];
+					_tmp17_ = _tmp16_[1];
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp19_ = g_strdup (_tmp18_);
+					_tmp18_ = g_strdup (_tmp17_);
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_g_free0 (oauth_token);
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					oauth_token = _tmp19_;
-#line 2491 "TumblrPublishing.c"
+					oauth_token = _tmp18_;
+#line 2487 "TumblrPublishing.c"
 				} else {
-					gchar** _tmp20_ = NULL;
-					gint _tmp20__length1 = 0;
-					const gchar* _tmp21_ = NULL;
+					gchar** _tmp19_;
+					gint _tmp19__length1;
+					const gchar* _tmp20_;
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp20_ = split_pair;
+					_tmp19_ = split_pair;
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp20__length1 = split_pair_length1;
+					_tmp19__length1 = split_pair_length1;
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp21_ = _tmp20_[0];
+					_tmp20_ = _tmp19_[0];
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					if (g_strcmp0 (_tmp21_, "oauth_token_secret") == 0) {
-#line 2504 "TumblrPublishing.c"
-						gchar** _tmp22_ = NULL;
-						gint _tmp22__length1 = 0;
-						const gchar* _tmp23_ = NULL;
-						gchar* _tmp24_ = NULL;
+					if (g_strcmp0 (_tmp20_, "oauth_token_secret") == 0) {
+#line 2500 "TumblrPublishing.c"
+						gchar** _tmp21_;
+						gint _tmp21__length1;
+						const gchar* _tmp22_;
+						gchar* _tmp23_;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp22_ = split_pair;
+						_tmp21_ = split_pair;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp22__length1 = split_pair_length1;
+						_tmp21__length1 = split_pair_length1;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp23_ = _tmp22_[1];
+						_tmp22_ = _tmp21_[1];
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp24_ = g_strdup (_tmp23_);
+						_tmp23_ = g_strdup (_tmp22_);
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 						_g_free0 (oauth_token_secret);
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						oauth_token_secret = _tmp24_;
-#line 2521 "TumblrPublishing.c"
+						oauth_token_secret = _tmp23_;
+#line 2517 "TumblrPublishing.c"
 					}
 				}
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				split_pair = (_vala_array_free (split_pair, split_pair_length1, (GDestroyNotify) g_free), NULL);
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_g_free0 (pair);
-#line 2528 "TumblrPublishing.c"
+#line 2524 "TumblrPublishing.c"
 			}
 		}
 	}
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp26_ = oauth_token;
+	_tmp25_ = oauth_token;
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp26_ == NULL) {
+	if (_tmp25_ == NULL) {
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp25_ = TRUE;
-#line 2538 "TumblrPublishing.c"
+		_tmp24_ = TRUE;
+#line 2534 "TumblrPublishing.c"
 	} else {
-		const gchar* _tmp27_ = NULL;
+		const gchar* _tmp26_;
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp27_ = oauth_token_secret;
+		_tmp26_ = oauth_token_secret;
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp25_ = _tmp27_ == NULL;
-#line 2545 "TumblrPublishing.c"
+		_tmp24_ = _tmp26_ == NULL;
+#line 2541 "TumblrPublishing.c"
 	}
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp25_) {
-#line 2549 "TumblrPublishing.c"
-		SpitPublishingPluginHost* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		const gchar* _tmp30_ = NULL;
-		GError* _tmp31_ = NULL;
-		GError* _tmp32_ = NULL;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp28_ = self->priv->host;
+	if (_tmp24_) {
+#line 2545 "TumblrPublishing.c"
+		SpitPublishingPluginHost* _tmp27_;
+		const gchar* _tmp28_;
+		GError* _tmp29_;
+		GError* _tmp30_;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp29_ = _ ("“%s” isn’t a valid response to an OAuth authentication request");
+		_tmp27_ = self->priv->host;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp30_ = response;
+		_tmp28_ = response;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp31_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp29_, _tmp30_);
+		_tmp29_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _ ("“%s” isn’t a valid response to an OAuth authentication request"), _tmp28_);
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp32_ = _tmp31_;
+		_tmp30_ = _tmp29_;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp28_, _tmp32_);
+		spit_publishing_plugin_host_post_error (_tmp27_, _tmp30_);
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_error_free0 (_tmp32_);
-#line 2569 "TumblrPublishing.c"
+		_g_error_free0 (_tmp30_);
+#line 2562 "TumblrPublishing.c"
 	}
 #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp33_ = self->priv->session;
+	_tmp31_ = self->priv->session;
 #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp34_ = oauth_token;
+	_tmp32_ = oauth_token;
 #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp35_ = oauth_token_secret;
+	_tmp33_ = oauth_token_secret;
 #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (_tmp33_, _tmp34_, _tmp35_);
+	publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (_tmp31_, _tmp32_, _tmp33_);
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	key_value_pairs = (_vala_array_free (key_value_pairs, key_value_pairs_length1, (GDestroyNotify) g_free), NULL);
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (oauth_token_secret);
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (oauth_token);
-#line 2585 "TumblrPublishing.c"
+#line 2578 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_session_authenticated (PublishingTumblrTumblrPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-	PublishingTumblrTumblrPublisherSession* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	gboolean _tmp0_;
+	PublishingTumblrTumblrPublisherSession* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	PublishingTumblrTumblrPublisherSession* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2605,7 +2598,7 @@ static void publishing_tumblr_tumblr_publisher_on_session_authenticated (Publish
 	if (!_tmp0_) {
 #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 2605 "TumblrPublishing.c"
+#line 2598 "TumblrPublishing.c"
 	}
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_debug ("TumblrPublishing.vala:332: EVENT: a fully authenticated session has be" \
@@ -2632,28 +2625,28 @@ static void publishing_tumblr_tumblr_publisher_on_session_authenticated (Publish
 	_g_free0 (_tmp6_);
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_do_get_blogs (self);
-#line 2631 "TumblrPublishing.c"
+#line 2624 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_info_request_txn_completed ((PublishingTumblrTumblrPublisher*) self, _sender);
-#line 2638 "TumblrPublishing.c"
+#line 2631 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_info_request_txn_error ((PublishingTumblrTumblrPublisher*) self, _sender, err);
-#line 2645 "TumblrPublishing.c"
+#line 2638 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTumblrPublisher* self) {
 	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* txn = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL;
-	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* _tmp1_ = NULL;
+	PublishingTumblrTumblrPublisherSession* _tmp0_;
+	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
@@ -2669,7 +2662,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
 #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 2668 "TumblrPublishing.c"
+#line 2661 "TumblrPublishing.c"
 	{
 #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -2677,7 +2670,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2676 "TumblrPublishing.c"
+#line 2669 "TumblrPublishing.c"
 				goto __catch33_spit_publishing_publishing_error;
 			}
 #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2688,15 +2681,15 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
 			g_clear_error (&_inner_error_);
 #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 2687 "TumblrPublishing.c"
+#line 2680 "TumblrPublishing.c"
 		}
 	}
 	goto __finally33;
 	__catch33_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp2_ = NULL;
-		GError* _tmp3_ = NULL;
+		SpitPublishingPluginHost* _tmp2_;
+		GError* _tmp3_;
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		err = _inner_error_;
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2709,7 +2702,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
 		spit_publishing_plugin_host_post_error (_tmp2_, _tmp3_);
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_error_free0 (err);
-#line 2708 "TumblrPublishing.c"
+#line 2701 "TumblrPublishing.c"
 	}
 	__finally33:
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2722,26 +2715,26 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
 		g_clear_error (&_inner_error_);
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 2721 "TumblrPublishing.c"
+#line 2714 "TumblrPublishing.c"
 	}
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 2725 "TumblrPublishing.c"
+#line 2718 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	PublishingRESTSupportTransaction* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingRESTSupportTransaction* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	PublishingRESTSupportTransaction* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2764,7 +2757,7 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (Pu
 	if (!_tmp4_) {
 #line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 2763 "TumblrPublishing.c"
+#line 2756 "TumblrPublishing.c"
 	}
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = txn;
@@ -2789,156 +2782,198 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (Pu
 	_g_free0 (_tmp10_);
 #line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (self);
-#line 2787 "TumblrPublishing.c"
+#line 2780 "TumblrPublishing.c"
 }
 
 
 static gpointer _json_object_ref0 (gpointer self) {
 #line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self ? json_object_ref (self) : NULL;
-#line 2794 "TumblrPublishing.c"
+#line 2787 "TumblrPublishing.c"
 }
 
 
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp1_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 2807 "TumblrPublishing.c"
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if ((*((gchar*) self)) == '\0') {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = TRUE;
+#line 2806 "TumblrPublishing.c"
+	} else {
+		const gchar* _tmp2_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp2_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
+#line 2813 "TumblrPublishing.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp1_) {
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = TRUE;
+#line 2819 "TumblrPublishing.c"
+	} else {
+		const gchar* _tmp3_;
+		const gchar* _tmp4_;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp3_ = old;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp4_ = replacement;
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
+#line 2829 "TumblrPublishing.c"
+	}
+#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 2833 "TumblrPublishing.c"
+		gchar* _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp5_ = g_strdup (self);
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp5_;
+#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		return result;
+#line 2841 "TumblrPublishing.c"
+	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		GRegex* _tmp9_;
+		GRegex* _tmp10_;
+		gchar* _tmp11_ = NULL;
+		GRegex* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp6_ = old;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp7_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp9_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp8_);
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		regex = _tmp10_;
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2838 "TumblrPublishing.c"
+#line 2873 "TumblrPublishing.c"
 				goto __catch35_g_regex_error;
 			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 2847 "TumblrPublishing.c"
+#line 2882 "TumblrPublishing.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp12_ = regex;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp13_ = replacement;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = _tmp14_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2863 "TumblrPublishing.c"
+#line 2898 "TumblrPublishing.c"
 				goto __catch35_g_regex_error;
 			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 2874 "TumblrPublishing.c"
+#line 2909 "TumblrPublishing.c"
 		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp15_ = _tmp11_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_tmp11_ = NULL;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		result = _tmp15_;
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp11_);
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2888 "TumblrPublishing.c"
+#line 2923 "TumblrPublishing.c"
 	}
 	goto __finally35;
 	__catch35_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 2902 "TumblrPublishing.c"
+#line 2937 "TumblrPublishing.c"
 	}
 	__finally35:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 2913 "TumblrPublishing.c"
+#line 2948 "TumblrPublishing.c"
 	}
 }
 
 
-static void _vala_array_add21 (PublishingTumblrBlogEntry*** array, int* length, int* size, PublishingTumblrBlogEntry* value) {
+static void _vala_array_add21 (PublishingTumblrBlogEntry** * array, int* length, int* size, PublishingTumblrBlogEntry* value) {
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*array = g_renew (PublishingTumblrBlogEntry*, *array, (*size) + 1);
-#line 2925 "TumblrPublishing.c"
+#line 2960 "TumblrPublishing.c"
 	}
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 2931 "TumblrPublishing.c"
+#line 2966 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_request (PublishingTumblrTumblrPublisher* self, const gchar* response) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
@@ -2949,26 +2984,26 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_debug ("TumblrPublishing.vala:370: ACTION: parsing info request response '%s' " \
 "into list of available blogs", _tmp0_);
-#line 2946 "TumblrPublishing.c"
+#line 2981 "TumblrPublishing.c"
 	{
 		JsonParser* parser = NULL;
-		JsonParser* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		JsonParser* _tmp1_;
+		const gchar* _tmp2_;
 		JsonObject* root_object = NULL;
-		JsonNode* _tmp3_ = NULL;
-		JsonObject* _tmp4_ = NULL;
-		JsonObject* _tmp5_ = NULL;
-		JsonObject* _tmp6_ = NULL;
-		JsonObject* _tmp7_ = NULL;
-		JsonObject* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		JsonObject* _tmp12_ = NULL;
-		JsonObject* _tmp13_ = NULL;
-		JsonObject* _tmp14_ = NULL;
-		JsonArray* _tmp15_ = NULL;
-		GList* _tmp16_ = NULL;
+		JsonNode* _tmp3_;
+		JsonObject* _tmp4_;
+		JsonObject* _tmp5_;
+		JsonObject* _tmp6_;
+		JsonObject* _tmp7_;
+		JsonObject* _tmp8_;
+		const gchar* _tmp9_;
+		gchar* _tmp10_;
+		const gchar* _tmp11_;
+		JsonObject* _tmp12_;
+		JsonObject* _tmp13_;
+		JsonObject* _tmp14_;
+		JsonArray* _tmp15_;
+		GList* _tmp16_;
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp1_ = json_parser_new ();
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2981,7 +3016,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_object_unref0 (parser);
-#line 2978 "TumblrPublishing.c"
+#line 3013 "TumblrPublishing.c"
 			goto __catch34_g_error;
 		}
 #line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3020,7 +3055,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 		_tmp15_ = json_object_get_array_member (_tmp14_, "blogs");
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp16_ = json_array_get_elements (_tmp15_);
-#line 3017 "TumblrPublishing.c"
+#line 3052 "TumblrPublishing.c"
 		{
 			GList* blognode_collection = NULL;
 			GList* blognode_it = NULL;
@@ -3028,34 +3063,34 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 			blognode_collection = _tmp16_;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			for (blognode_it = blognode_collection; blognode_it != NULL; blognode_it = blognode_it->next) {
-#line 3025 "TumblrPublishing.c"
+#line 3060 "TumblrPublishing.c"
 				JsonNode* blognode = NULL;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				blognode = (JsonNode*) blognode_it->data;
-#line 3029 "TumblrPublishing.c"
+#line 3064 "TumblrPublishing.c"
 				{
 					JsonObject* blog = NULL;
-					JsonNode* _tmp17_ = NULL;
-					JsonObject* _tmp18_ = NULL;
-					JsonObject* _tmp19_ = NULL;
+					JsonNode* _tmp17_;
+					JsonObject* _tmp18_;
+					JsonObject* _tmp19_;
 					gchar* name = NULL;
-					JsonObject* _tmp20_ = NULL;
-					const gchar* _tmp21_ = NULL;
-					gchar* _tmp22_ = NULL;
+					JsonObject* _tmp20_;
+					const gchar* _tmp21_;
+					gchar* _tmp22_;
 					gchar* url = NULL;
-					JsonObject* _tmp23_ = NULL;
-					const gchar* _tmp24_ = NULL;
-					gchar* _tmp25_ = NULL;
-					gchar* _tmp26_ = NULL;
-					gchar* _tmp27_ = NULL;
-					gchar* _tmp28_ = NULL;
-					const gchar* _tmp29_ = NULL;
-					const gchar* _tmp30_ = NULL;
-					PublishingTumblrBlogEntry** _tmp31_ = NULL;
-					gint _tmp31__length1 = 0;
-					const gchar* _tmp32_ = NULL;
-					const gchar* _tmp33_ = NULL;
-					PublishingTumblrBlogEntry* _tmp34_ = NULL;
+					JsonObject* _tmp23_;
+					const gchar* _tmp24_;
+					gchar* _tmp25_;
+					gchar* _tmp26_;
+					gchar* _tmp27_;
+					gchar* _tmp28_;
+					const gchar* _tmp29_;
+					const gchar* _tmp30_;
+					PublishingTumblrBlogEntry** _tmp31_;
+					gint _tmp31__length1;
+					const gchar* _tmp32_;
+					const gchar* _tmp33_;
+					PublishingTumblrBlogEntry* _tmp34_;
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp17_ = blognode;
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3112,25 +3147,25 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 					_g_free0 (name);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_json_object_unref0 (blog);
-#line 3109 "TumblrPublishing.c"
+#line 3144 "TumblrPublishing.c"
 				}
 			}
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_list_free0 (blognode_collection);
-#line 3114 "TumblrPublishing.c"
+#line 3149 "TumblrPublishing.c"
 		}
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_json_object_unref0 (root_object);
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (parser);
-#line 3120 "TumblrPublishing.c"
+#line 3155 "TumblrPublishing.c"
 	}
 	goto __finally34;
 	__catch34_g_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp35_ = NULL;
-		GError* _tmp36_ = NULL;
+		SpitPublishingPluginHost* _tmp35_;
+		GError* _tmp36_;
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		err = _inner_error_;
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3143,7 +3178,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 		spit_publishing_plugin_host_post_error (_tmp35_, _tmp36_);
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_error_free0 (err);
-#line 3140 "TumblrPublishing.c"
+#line 3175 "TumblrPublishing.c"
 	}
 	__finally34:
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3154,20 +3189,20 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 		g_clear_error (&_inner_error_);
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3151 "TumblrPublishing.c"
+#line 3186 "TumblrPublishing.c"
 	}
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingTumblrTumblrPublisherSession* _tmp5_ = NULL;
-	SpitPublishingPluginHost* _tmp6_ = NULL;
-	GError* _tmp7_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	gboolean _tmp4_;
+	PublishingTumblrTumblrPublisherSession* _tmp5_;
+	SpitPublishingPluginHost* _tmp6_;
+	GError* _tmp7_;
 #line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3190,7 +3225,7 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (Publis
 	if (!_tmp4_) {
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3187 "TumblrPublishing.c"
+#line 3222 "TumblrPublishing.c"
 	}
 #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = self->priv->session;
@@ -3207,36 +3242,36 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (Publis
 	_tmp7_ = err;
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
-#line 3203 "TumblrPublishing.c"
+#line 3238 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish ((PublishingTumblrTumblrPublisher*) self);
-#line 3210 "TumblrPublishing.c"
+#line 3245 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
 #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout ((PublishingTumblrTumblrPublisher*) self);
-#line 3217 "TumblrPublishing.c"
+#line 3252 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (PublishingTumblrTumblrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 	PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_options_pane = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	SpitPublishingPublisherMediaType _tmp2_ = 0;
-	PublishingTumblrSizeEntry** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	PublishingTumblrBlogEntry** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	const gchar* _tmp5_ = NULL;
-	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp6_ = NULL;
-	SpitPublishingPluginHost* _tmp7_ = NULL;
+	SpitPublishingPluginHost* _tmp1_;
+	SpitPublishingPublisherMediaType _tmp2_;
+	PublishingTumblrSizeEntry** _tmp3_;
+	gint _tmp3__length1;
+	PublishingTumblrBlogEntry** _tmp4_;
+	gint _tmp4__length1;
+	const gchar* _tmp5_;
+	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp6_;
+	SpitPublishingPluginHost* _tmp7_;
 #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3273,24 +3308,24 @@ static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (
 	spit_publishing_plugin_host_install_dialog_pane (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_object_unref0 (publishing_options_pane);
-#line 3269 "TumblrPublishing.c"
+#line 3304 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish (PublishingTumblrTumblrPublisher* self) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_;
+	gboolean _tmp5_;
 #line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = self->priv->publishing_options_pane;
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 3282 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_ = NULL;
-		guint _tmp2_ = 0U;
-		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_ = NULL;
-		guint _tmp4_ = 0U;
+#line 3317 "TumblrPublishing.c"
+		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_;
+		guint _tmp2_;
+		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_;
+		guint _tmp4_;
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp1_ = self->priv->publishing_options_pane;
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3303,7 +3338,7 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publis
 		g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE);
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
-#line 3299 "TumblrPublishing.c"
+#line 3334 "TumblrPublishing.c"
 	}
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
@@ -3311,31 +3346,31 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publis
 	if (!_tmp5_) {
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3307 "TumblrPublishing.c"
+#line 3342 "TumblrPublishing.c"
 	}
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_debug ("TumblrPublishing.vala:424: EVENT: user clicked the 'Publish' button in" \
 " the publishing options pane");
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_do_publish (self);
-#line 3313 "TumblrPublishing.c"
+#line 3348 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout (PublishingTumblrTumblrPublisher* self) {
-	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp0_;
+	gboolean _tmp5_;
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = self->priv->publishing_options_pane;
 #line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 3326 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_ = NULL;
-		guint _tmp2_ = 0U;
-		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_ = NULL;
-		guint _tmp4_ = 0U;
+#line 3361 "TumblrPublishing.c"
+		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_;
+		guint _tmp2_;
+		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_;
+		guint _tmp4_;
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp1_ = self->priv->publishing_options_pane;
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3348,7 +3383,7 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout
 		g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE);
 #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
-#line 3343 "TumblrPublishing.c"
+#line 3378 "TumblrPublishing.c"
 	}
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
@@ -3356,27 +3391,27 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout
 	if (!_tmp5_) {
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3351 "TumblrPublishing.c"
+#line 3386 "TumblrPublishing.c"
 	}
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_debug ("TumblrPublishing.vala:437: EVENT: user clicked the 'Logout' button in " \
 "the publishing options pane");
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_do_logout (self);
-#line 3357 "TumblrPublishing.c"
+#line 3392 "TumblrPublishing.c"
 }
 
 
 gint publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPublishingPublishable* a, SpitPublishingPublishable* b) {
 	gint result = 0;
-	SpitPublishingPublishable* _tmp0_ = NULL;
-	GDateTime* _tmp1_ = NULL;
-	GDateTime* _tmp2_ = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
-	GDateTime* _tmp4_ = NULL;
-	GDateTime* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
+	SpitPublishingPublishable* _tmp0_;
+	GDateTime* _tmp1_;
+	GDateTime* _tmp2_;
+	SpitPublishingPublishable* _tmp3_;
+	GDateTime* _tmp4_;
+	GDateTime* _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
 #line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (a), 0);
 #line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3405,7 +3440,7 @@ gint publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPubli
 	result = _tmp7_;
 #line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 3399 "TumblrPublishing.c"
+#line 3434 "TumblrPublishing.c"
 }
 
 
@@ -3414,74 +3449,74 @@ static gint _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gc
 	result = publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func ((SpitPublishingPublishable*) a, (SpitPublishingPublishable*) b);
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 3408 "TumblrPublishing.c"
+#line 3443 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_upload_complete ((PublishingTumblrTumblrPublisher*) self, _sender, num_photos_published);
-#line 3415 "TumblrPublishing.c"
+#line 3450 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_upload_error ((PublishingTumblrTumblrPublisher*) self, _sender, err);
-#line 3422 "TumblrPublishing.c"
+#line 3457 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_upload_status_updated ((PublishingTumblrTumblrPublisher*) self, file_number, fraction_complete);
-#line 3429 "TumblrPublishing.c"
+#line 3464 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumblrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	PublishingTumblrSizeEntry** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	gint _tmp3_ = 0;
-	PublishingTumblrSizeEntry* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	void* _tmp6_ = NULL;
-	GDestroyNotify _tmp7_ = NULL;
-	SpitPublishingProgressCallback _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingTumblrSizeEntry** _tmp2_;
+	gint _tmp2__length1;
+	gint _tmp3_;
+	PublishingTumblrSizeEntry* _tmp4_;
+	gint _tmp5_;
+	void* _tmp6_;
+	GDestroyNotify _tmp7_;
+	SpitPublishingProgressCallback _tmp8_;
+	gboolean _tmp9_;
 	SpitPublishingPublishable** publishables = NULL;
-	SpitPublishingPluginHost* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	SpitPublishingPublishable** _tmp12_ = NULL;
-	gint publishables_length1 = 0;
-	gint _publishables_size_ = 0;
+	SpitPublishingPluginHost* _tmp10_;
+	gint _tmp11_;
+	SpitPublishingPublishable** _tmp12_;
+	gint publishables_length1;
+	gint _publishables_size_;
 	GeeArrayList* sorted_list = NULL;
-	GeeArrayList* _tmp13_ = NULL;
-	SpitPublishingPublishable** _tmp14_ = NULL;
-	gint _tmp14__length1 = 0;
-	GeeArrayList* _tmp18_ = NULL;
+	GeeArrayList* _tmp13_;
+	SpitPublishingPublishable** _tmp14_;
+	gint _tmp14__length1;
+	GeeArrayList* _tmp18_;
 	gchar* blog_url = NULL;
-	PublishingTumblrBlogEntry** _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
-	gint _tmp20_ = 0;
-	PublishingTumblrBlogEntry* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
+	PublishingTumblrBlogEntry** _tmp19_;
+	gint _tmp19__length1;
+	gint _tmp20_;
+	PublishingTumblrBlogEntry* _tmp21_;
+	const gchar* _tmp22_;
+	gchar* _tmp23_;
 	PublishingTumblrTumblrPublisherUploader* uploader = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp24_ = NULL;
-	GeeArrayList* _tmp25_ = NULL;
-	gint _tmp26_ = 0;
-	gpointer* _tmp27_ = NULL;
-	SpitPublishingPublishable** _tmp28_ = NULL;
-	gint _tmp28__length1 = 0;
-	const gchar* _tmp29_ = NULL;
-	PublishingTumblrTumblrPublisherUploader* _tmp30_ = NULL;
-	PublishingTumblrTumblrPublisherUploader* _tmp31_ = NULL;
-	PublishingTumblrTumblrPublisherUploader* _tmp32_ = NULL;
-	PublishingTumblrTumblrPublisherUploader* _tmp33_ = NULL;
-	PublishingTumblrTumblrPublisherUploader* _tmp34_ = NULL;
+	PublishingTumblrTumblrPublisherSession* _tmp24_;
+	GeeArrayList* _tmp25_;
+	gint _tmp26_;
+	gpointer* _tmp27_;
+	SpitPublishingPublishable** _tmp28_;
+	gint _tmp28__length1;
+	const gchar* _tmp29_;
+	PublishingTumblrTumblrPublisherUploader* _tmp30_;
+	PublishingTumblrTumblrPublisherUploader* _tmp31_;
+	PublishingTumblrTumblrPublisherUploader* _tmp32_;
+	PublishingTumblrTumblrPublisherUploader* _tmp33_;
+	PublishingTumblrTumblrPublisherUploader* _tmp34_;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3525,7 +3560,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
 	if (!_tmp9_) {
 #line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3518 "TumblrPublishing.c"
+#line 3553 "TumblrPublishing.c"
 	}
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp10_ = self->priv->host;
@@ -3545,7 +3580,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
 	_tmp14_ = publishables;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp14__length1 = publishables_length1;
-#line 3538 "TumblrPublishing.c"
+#line 3573 "TumblrPublishing.c"
 	{
 		SpitPublishingPublishable** p_collection = NULL;
 		gint p_collection_length1 = 0;
@@ -3557,17 +3592,17 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
 		p_collection_length1 = _tmp14__length1;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) {
-#line 3550 "TumblrPublishing.c"
-			SpitPublishingPublishable* _tmp15_ = NULL;
+#line 3585 "TumblrPublishing.c"
+			SpitPublishingPublishable* _tmp15_;
 			SpitPublishingPublishable* p = NULL;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_tmp15_ = _g_object_ref0 (p_collection[p_it]);
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			p = _tmp15_;
-#line 3557 "TumblrPublishing.c"
+#line 3592 "TumblrPublishing.c"
 			{
-				GeeArrayList* _tmp16_ = NULL;
-				SpitPublishingPublishable* _tmp17_ = NULL;
+				GeeArrayList* _tmp16_;
+				SpitPublishingPublishable* _tmp17_;
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				g_debug ("TumblrPublishing.vala:466: ACTION: add publishable");
 #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3578,7 +3613,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_g_object_unref0 (p);
-#line 3571 "TumblrPublishing.c"
+#line 3606 "TumblrPublishing.c"
 			}
 		}
 	}
@@ -3640,13 +3675,13 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
 	_g_object_unref0 (sorted_list);
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 3633 "TumblrPublishing.c"
+#line 3668 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingTumblrTumblrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
 #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3659,19 +3694,19 @@ static void publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingT
 	_tmp1_ = self->priv->host;
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 3652 "TumblrPublishing.c"
+#line 3687 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (PublishingTumblrTumblrPublisher* self, gint file_number, gdouble completed_fraction) {
-	gboolean _tmp0_ = FALSE;
-	gdouble _tmp1_ = 0.0;
-	SpitPublishingProgressCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	SpitPublishingProgressCallback _tmp3_ = NULL;
-	void* _tmp3__target = NULL;
-	gint _tmp4_ = 0;
-	gdouble _tmp5_ = 0.0;
+	gboolean _tmp0_;
+	gdouble _tmp1_;
+	SpitPublishingProgressCallback _tmp2_;
+	void* _tmp2__target;
+	SpitPublishingProgressCallback _tmp3_;
+	void* _tmp3__target;
+	gint _tmp4_;
+	gdouble _tmp5_;
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3680,7 +3715,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (Publish
 	if (!_tmp0_) {
 #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3673 "TumblrPublishing.c"
+#line 3708 "TumblrPublishing.c"
 	}
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = completed_fraction;
@@ -3703,17 +3738,17 @@ static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (Publish
 	_tmp5_ = completed_fraction;
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 3695 "TumblrPublishing.c"
+#line 3730 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
+	gboolean _tmp0_;
+	gint _tmp1_;
+	PublishingRESTSupportBatchUploader* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportBatchUploader* _tmp4_;
+	guint _tmp5_;
 #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3724,7 +3759,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTum
 	if (!_tmp0_) {
 #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3716 "TumblrPublishing.c"
+#line 3751 "TumblrPublishing.c"
 	}
 #line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = num_published;
@@ -3745,20 +3780,20 @@ static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTum
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_do_show_success_pane (self);
-#line 3736 "TumblrPublishing.c"
+#line 3771 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblrTumblrPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
-	gboolean _tmp0_ = FALSE;
-	GError* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingRESTSupportBatchUploader* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	SpitPublishingPluginHost* _tmp7_ = NULL;
-	GError* _tmp8_ = NULL;
+	gboolean _tmp0_;
+	GError* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingRESTSupportBatchUploader* _tmp3_;
+	guint _tmp4_;
+	PublishingRESTSupportBatchUploader* _tmp5_;
+	guint _tmp6_;
+	SpitPublishingPluginHost* _tmp7_;
+	GError* _tmp8_;
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3769,7 +3804,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblr
 	if (!_tmp0_) {
 #line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3760 "TumblrPublishing.c"
+#line 3795 "TumblrPublishing.c"
 	}
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = err;
@@ -3796,12 +3831,12 @@ static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblr
 	_tmp8_ = err;
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 3786 "TumblrPublishing.c"
+#line 3821 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblrPublisher* self) {
-	PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL;
+	PublishingTumblrTumblrPublisherSession* _tmp0_;
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3817,13 +3852,13 @@ static void publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblr
 	self->priv->running = FALSE;
 #line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_attempt_start (self);
-#line 3806 "TumblrPublishing.c"
+#line 3841 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3832,7 +3867,7 @@ void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPub
 	if (_tmp0_) {
 #line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3821 "TumblrPublishing.c"
+#line 3856 "TumblrPublishing.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_debug ("TumblrPublishing.vala:539: TumblrPublisher: starting interaction.");
@@ -3842,12 +3877,12 @@ void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPub
 	_tmp1_ = publishing_tumblr_tumblr_publisher_is_persistent_session_valid (self);
 #line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp1_) {
-#line 3831 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherSession* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+#line 3866 "TumblrPublishing.c"
+		PublishingTumblrTumblrPublisherSession* _tmp2_;
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_debug ("TumblrPublishing.vala:543: attempt start: a persistent session is avai" \
 "lable; using it");
@@ -3867,22 +3902,22 @@ void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPub
 		_g_free0 (_tmp6_);
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (_tmp4_);
-#line 3855 "TumblrPublishing.c"
+#line 3890 "TumblrPublishing.c"
 	} else {
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_debug ("TumblrPublishing.vala:548: attempt start: no persistent session availa" \
 "ble; showing login welcome pane");
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_tumblr_tumblr_publisher_do_show_authentication_pane (self, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO);
-#line 3861 "TumblrPublishing.c"
+#line 3896 "TumblrPublishing.c"
 	}
 }
 
 
 static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublisher* base) {
 	PublishingTumblrTumblrPublisher * self;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
 #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
 #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3891,26 +3926,22 @@ static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublish
 	if (_tmp0_) {
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3878 "TumblrPublishing.c"
+#line 3913 "TumblrPublishing.c"
 	}
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = self->priv->was_started;
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp1_) {
-#line 3884 "TumblrPublishing.c"
-		const gchar* _tmp2_ = NULL;
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp2_ = _ ("TumblrPublisher: start( ): can’t start; this publisher is not restarta" \
-"ble.");
 #line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_error ("TumblrPublishing.vala:559: %s", _tmp2_);
-#line 3890 "TumblrPublishing.c"
+		g_error ("TumblrPublishing.vala:559: %s", _ ("TumblrPublisher: start( ): can’t start; this publisher is not restarta" \
+"ble."));
+#line 3921 "TumblrPublishing.c"
 	}
 #line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_debug ("TumblrPublishing.vala:561: TumblrPublisher: starting interaction.");
 #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_attempt_start (self);
-#line 3896 "TumblrPublishing.c"
+#line 3927 "TumblrPublishing.c"
 }
 
 
@@ -3922,7 +3953,7 @@ static void publishing_tumblr_tumblr_publisher_real_stop (SpitPublishingPublishe
 	g_debug ("TumblrPublishing.vala:567: TumblrPublisher: stop( ) invoked.");
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->running = FALSE;
-#line 3908 "TumblrPublishing.c"
+#line 3939 "TumblrPublishing.c"
 }
 
 
@@ -3941,27 +3972,27 @@ GType publishing_tumblr_tumblr_publisher_authentication_pane_mode_get_type (void
 static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed ((PublishingTumblrTumblrPublisherAuthenticationPane*) self);
-#line 3927 "TumblrPublishing.c"
+#line 3958 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed ((PublishingTumblrTumblrPublisherAuthenticationPane*) self);
-#line 3934 "TumblrPublishing.c"
+#line 3965 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked ((PublishingTumblrTumblrPublisherAuthenticationPane*) self);
-#line 3941 "TumblrPublishing.c"
+#line 3972 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publisher_authentication_pane_construct (GType object_type, PublishingTumblrTumblrPublisher* publisher, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode) {
 	PublishingTumblrTumblrPublisherAuthenticationPane * self = NULL;
-	GtkBox* _tmp0_ = NULL;
+	GtkBox* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (publisher), NULL);
@@ -3975,42 +4006,42 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 	_g_object_unref0 (self->priv->pane_widget);
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->pane_widget = _tmp0_;
-#line 3961 "TumblrPublishing.c"
+#line 3992 "TumblrPublishing.c"
 	{
-		GtkBuilder* _tmp1_ = NULL;
-		GtkBuilder* _tmp2_ = NULL;
-		GtkBuilder* _tmp3_ = NULL;
+		GtkBuilder* _tmp1_;
+		GtkBuilder* _tmp2_;
+		GtkBuilder* _tmp3_;
 		GtkWidget* content = NULL;
-		GtkBuilder* _tmp4_ = NULL;
-		GObject* _tmp5_ = NULL;
-		GtkWidget* _tmp6_ = NULL;
+		GtkBuilder* _tmp4_;
+		GObject* _tmp5_;
+		GtkWidget* _tmp6_;
 		GtkLabel* message_label = NULL;
-		GtkBuilder* _tmp7_ = NULL;
-		GObject* _tmp8_ = NULL;
-		GtkLabel* _tmp9_ = NULL;
-		PublishingTumblrTumblrPublisherAuthenticationPaneMode _tmp10_ = 0;
-		GtkBuilder* _tmp18_ = NULL;
-		GObject* _tmp19_ = NULL;
-		GtkEntry* _tmp20_ = NULL;
-		GtkBuilder* _tmp21_ = NULL;
-		GObject* _tmp22_ = NULL;
-		GtkEntry* _tmp23_ = NULL;
-		GtkBuilder* _tmp24_ = NULL;
-		GObject* _tmp25_ = NULL;
-		GtkButton* _tmp26_ = NULL;
-		GtkEntry* _tmp27_ = NULL;
-		GtkEntry* _tmp28_ = NULL;
-		GtkButton* _tmp29_ = NULL;
-		GtkWidget* _tmp30_ = NULL;
-		GtkContainer* _tmp31_ = NULL;
-		GtkContainer* _tmp32_ = NULL;
-		GtkWidget* _tmp33_ = NULL;
-		GtkBox* _tmp34_ = NULL;
-		GtkWidget* _tmp35_ = NULL;
-		PublishingTumblrTumblrPublisher* _tmp36_ = NULL;
-		SpitPublishingPluginHost* _tmp37_ = NULL;
-		SpitPublishingPluginHost* _tmp38_ = NULL;
-		GtkButton* _tmp39_ = NULL;
+		GtkBuilder* _tmp7_;
+		GObject* _tmp8_;
+		GtkLabel* _tmp9_;
+		PublishingTumblrTumblrPublisherAuthenticationPaneMode _tmp10_;
+		GtkBuilder* _tmp17_;
+		GObject* _tmp18_;
+		GtkEntry* _tmp19_;
+		GtkBuilder* _tmp20_;
+		GObject* _tmp21_;
+		GtkEntry* _tmp22_;
+		GtkBuilder* _tmp23_;
+		GObject* _tmp24_;
+		GtkButton* _tmp25_;
+		GtkEntry* _tmp26_;
+		GtkEntry* _tmp27_;
+		GtkButton* _tmp28_;
+		GtkWidget* _tmp29_;
+		GtkContainer* _tmp30_;
+		GtkContainer* _tmp31_;
+		GtkWidget* _tmp32_;
+		GtkBox* _tmp33_;
+		GtkWidget* _tmp34_;
+		PublishingTumblrTumblrPublisher* _tmp35_;
+		SpitPublishingPluginHost* _tmp36_;
+		SpitPublishingPluginHost* _tmp37_;
+		GtkButton* _tmp38_;
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp1_ = gtk_builder_new ();
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4023,7 +4054,7 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/tumblr_authentication_pane.ui", &_inner_error_);
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4009 "TumblrPublishing.c"
+#line 4040 "TumblrPublishing.c"
 			goto __catch36_g_error;
 		}
 #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4052,10 +4083,10 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 		switch (_tmp10_) {
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			case PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO:
-#line 4038 "TumblrPublishing.c"
+#line 4069 "TumblrPublishing.c"
 			{
-				GtkLabel* _tmp11_ = NULL;
-				const gchar* _tmp12_ = NULL;
+				GtkLabel* _tmp11_;
+				const gchar* _tmp12_;
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp11_ = message_label;
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4064,138 +4095,132 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 				gtk_label_set_text (_tmp11_, _tmp12_);
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				break;
-#line 4050 "TumblrPublishing.c"
+#line 4081 "TumblrPublishing.c"
 			}
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			case PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
-#line 4054 "TumblrPublishing.c"
+#line 4085 "TumblrPublishing.c"
 			{
-				GtkLabel* _tmp13_ = NULL;
-				const gchar* _tmp14_ = NULL;
-				const gchar* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
-				gchar* _tmp17_ = NULL;
+				GtkLabel* _tmp13_;
+				const gchar* _tmp14_;
+				gchar* _tmp15_;
+				gchar* _tmp16_;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp13_ = message_label;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp14_ = _ ("Invalid User Name or Password");
+				_tmp14_ = publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp15_ = publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE;
+				_tmp15_ = g_strdup_printf ("<b>%s</b>\n\n%s", _ ("Invalid User Name or Password"), _tmp14_);
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp16_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp14_, _tmp15_);
+				_tmp16_ = _tmp15_;
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp17_ = _tmp16_;
+				gtk_label_set_markup (_tmp13_, _tmp16_);
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				gtk_label_set_markup (_tmp13_, _tmp17_);
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp17_);
+				_g_free0 (_tmp16_);
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				break;
-#line 4077 "TumblrPublishing.c"
+#line 4105 "TumblrPublishing.c"
 			}
 			default:
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			break;
-#line 4082 "TumblrPublishing.c"
+#line 4110 "TumblrPublishing.c"
 		}
 #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp18_ = self->priv->builder;
+		_tmp17_ = self->priv->builder;
 #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp19_ = gtk_builder_get_object (_tmp18_, "username_entry");
+		_tmp18_ = gtk_builder_get_object (_tmp17_, "username_entry");
 #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp19_) : NULL);
+		_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : NULL);
 #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (self->priv->username_entry);
 #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->username_entry = _tmp20_;
+		self->priv->username_entry = _tmp19_;
 #line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp21_ = self->priv->builder;
+		_tmp20_ = self->priv->builder;
 #line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp22_ = gtk_builder_get_object (_tmp21_, "password_entry");
+		_tmp21_ = gtk_builder_get_object (_tmp20_, "password_entry");
 #line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp22_) : NULL);
+		_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp21_) : NULL);
 #line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (self->priv->password_entry);
 #line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->password_entry = _tmp23_;
+		self->priv->password_entry = _tmp22_;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp24_ = self->priv->builder;
+		_tmp23_ = self->priv->builder;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp25_ = gtk_builder_get_object (_tmp24_, "login_button");
+		_tmp24_ = gtk_builder_get_object (_tmp23_, "login_button");
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_button_get_type ()) ? ((GtkButton*) _tmp25_) : NULL);
+		_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_button_get_type ()) ? ((GtkButton*) _tmp24_) : NULL);
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (self->priv->login_button);
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->login_button = _tmp26_;
+		self->priv->login_button = _tmp25_;
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp27_ = self->priv->username_entry;
+		_tmp26_ = self->priv->username_entry;
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
 #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp28_ = self->priv->password_entry;
+		_tmp27_ = self->priv->password_entry;
 #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp29_ = self->priv->login_button;
+		_tmp28_ = self->priv->login_button;
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (_tmp29_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
+		g_signal_connect_object (_tmp28_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp30_ = content;
+		_tmp29_ = content;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp31_ = gtk_widget_get_parent (_tmp30_);
+		_tmp30_ = gtk_widget_get_parent (_tmp29_);
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp32_ = _tmp31_;
+		_tmp31_ = _tmp30_;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp33_ = content;
+		_tmp32_ = content;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_container_remove (_tmp32_, _tmp33_);
+		gtk_container_remove (_tmp31_, _tmp32_);
 #line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp34_ = self->priv->pane_widget;
+		_tmp33_ = self->priv->pane_widget;
 #line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp35_ = content;
+		_tmp34_ = content;
 #line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_container_get_type (), GtkContainer), _tmp35_);
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_container_get_type (), GtkContainer), _tmp34_);
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp36_ = publisher;
+		_tmp35_ = publisher;
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp37_ = publishing_tumblr_tumblr_publisher_get_host (_tmp36_);
+		_tmp36_ = publishing_tumblr_tumblr_publisher_get_host (_tmp35_);
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp38_ = _tmp37_;
+		_tmp37_ = _tmp36_;
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp39_ = self->priv->login_button;
+		_tmp38_ = self->priv->login_button;
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		spit_publishing_plugin_host_set_dialog_default_widget (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+		spit_publishing_plugin_host_set_dialog_default_widget (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
 #line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (_tmp38_);
+		_g_object_unref0 (_tmp37_);
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (message_label);
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (content);
-#line 4158 "TumblrPublishing.c"
+#line 4186 "TumblrPublishing.c"
 	}
 	goto __finally36;
 	__catch36_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp40_ = NULL;
-		GError* _tmp41_ = NULL;
-		const gchar* _tmp42_ = NULL;
+		GError* _tmp39_;
+		const gchar* _tmp40_;
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		e = _inner_error_;
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_inner_error_ = NULL;
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp40_ = _ ("Could not load UI: %s");
+		_tmp39_ = e;
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp41_ = e;
+		_tmp40_ = _tmp39_->message;
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp42_ = _tmp41_->message;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_warning (_tmp40_, _tmp42_);
+		g_warning (_ ("Could not load UI: %s"), _tmp40_);
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_error_free0 (e);
-#line 4181 "TumblrPublishing.c"
+#line 4206 "TumblrPublishing.c"
 	}
 	__finally36:
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4206,25 +4231,25 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 		g_clear_error (&_inner_error_);
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return NULL;
-#line 4192 "TumblrPublishing.c"
+#line 4217 "TumblrPublishing.c"
 	}
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 4196 "TumblrPublishing.c"
+#line 4221 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publisher_authentication_pane_new (PublishingTumblrTumblrPublisher* publisher, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode) {
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_authentication_pane_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, publisher, mode);
-#line 4203 "TumblrPublishing.c"
+#line 4228 "TumblrPublishing.c"
 }
 
 
 GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_get_default_widget (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
 	GtkWidget* result = NULL;
-	GtkButton* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkButton* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self), NULL);
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4235,15 +4260,15 @@ GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_get_default_wi
 	result = _tmp1_;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 4221 "TumblrPublishing.c"
+#line 4246 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkEntry* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	GtkEntry* _tmp0_;
+	const gchar* _tmp1_;
+	GtkEntry* _tmp2_;
+	const gchar* _tmp3_;
 #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
 #line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4255,8 +4280,8 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_on_login_butt
 #line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ = gtk_entry_get_text (_tmp2_);
 #line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_emit_by_name (self, "login", _tmp1_, _tmp3_);
-#line 4242 "TumblrPublishing.c"
+	g_signal_emit (self, publishing_tumblr_tumblr_publisher_authentication_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LOGIN_SIGNAL], 0, _tmp1_, _tmp3_);
+#line 4267 "TumblrPublishing.c"
 }
 
 
@@ -4265,7 +4290,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_on_user_chang
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
 #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self);
-#line 4251 "TumblrPublishing.c"
+#line 4276 "TumblrPublishing.c"
 }
 
 
@@ -4274,16 +4299,16 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_on_password_c
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
 #line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self);
-#line 4260 "TumblrPublishing.c"
+#line 4285 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
 	gboolean _tmp0_ = FALSE;
-	GtkEntry* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
-	GtkButton* _tmp7_ = NULL;
+	GtkEntry* _tmp1_;
+	guint _tmp2_;
+	guint _tmp3_;
+	GtkButton* _tmp7_;
 #line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4294,10 +4319,10 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_update_login_
 	_tmp3_ = _tmp2_;
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp3_ > ((guint) 0)) {
-#line 4280 "TumblrPublishing.c"
-		GtkEntry* _tmp4_ = NULL;
-		guint _tmp5_ = 0U;
-		guint _tmp6_ = 0U;
+#line 4305 "TumblrPublishing.c"
+		GtkEntry* _tmp4_;
+		guint _tmp5_;
+		guint _tmp6_;
 #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp4_ = self->priv->password_entry;
 #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4306,25 +4331,25 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_update_login_
 		_tmp6_ = _tmp5_;
 #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = _tmp6_ > ((guint) 0);
-#line 4292 "TumblrPublishing.c"
+#line 4317 "TumblrPublishing.c"
 	} else {
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = FALSE;
-#line 4296 "TumblrPublishing.c"
+#line 4321 "TumblrPublishing.c"
 	}
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp7_ = self->priv->login_button;
 #line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 4302 "TumblrPublishing.c"
+#line 4327 "TumblrPublishing.c"
 }
 
 
 static GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	PublishingTumblrTumblrPublisherAuthenticationPane * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
 #line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4335,7 +4360,7 @@ static GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_real_ge
 	result = _tmp1_;
 #line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 4321 "TumblrPublishing.c"
+#line 4346 "TumblrPublishing.c"
 }
 
 
@@ -4348,15 +4373,15 @@ static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publishe
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 4334 "TumblrPublishing.c"
+#line 4359 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingTumblrTumblrPublisherAuthenticationPane * self;
-	GtkEntry* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	GtkButton* _tmp2_ = NULL;
+	GtkEntry* _tmp0_;
+	GtkEntry* _tmp1_;
+	GtkButton* _tmp2_;
 #line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
 #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4373,7 +4398,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_
 	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self);
-#line 4359 "TumblrPublishing.c"
+#line 4384 "TumblrPublishing.c"
 }
 
 
@@ -4381,7 +4406,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_
 	PublishingTumblrTumblrPublisherAuthenticationPane * self;
 #line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
-#line 4367 "TumblrPublishing.c"
+#line 4392 "TumblrPublishing.c"
 }
 
 
@@ -4400,27 +4425,25 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GVa
 		data1 = closure->data;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4386 "TumblrPublishing.c"
+#line 4411 "TumblrPublishing.c"
 	} else {
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		data2 = closure->data;
-#line 4392 "TumblrPublishing.c"
+#line 4417 "TumblrPublishing.c"
 	}
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback);
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 4398 "TumblrPublishing.c"
+#line 4423 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_authentication_pane_class_init (PublishingTumblrTumblrPublisherAuthenticationPaneClass * klass) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_authentication_pane_parent_class = g_type_class_peek_parent (klass);
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4428,20 +4451,16 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_class_init (P
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_authentication_pane_finalize;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_new ("login", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
+	publishing_tumblr_tumblr_publisher_authentication_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_LOGIN_SIGNAL] = g_signal_new ("login", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
 #line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp0_ = _ ("Enter the username and password associated with your Tumblr account.");
+	_tmp0_ = g_strdup (_ ("Enter the username and password associated with your Tumblr account."));
 #line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSAGE = _tmp1_;
+	publishing_tumblr_tumblr_publisher_authentication_pane_INTRO_MESSAGE = _tmp0_;
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp2_ = _ ("Username and/or password invalid. Please try again");
+	_tmp1_ = g_strdup (_ ("Username and/or password invalid. Please try again"));
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp3_;
-#line 4427 "TumblrPublishing.c"
+	publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp1_;
+#line 4446 "TumblrPublishing.c"
 }
 
 
@@ -4449,14 +4468,14 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishi
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_authentication_pane_real_get_widget;
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_authentication_pane_real_get_widget;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_authentication_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_authentication_pane_real_get_preferred_geometry;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_installed;
+	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_installed;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_uninstalled;
-#line 4442 "TumblrPublishing.c"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_uninstalled;
+#line 4461 "TumblrPublishing.c"
 }
 
 
@@ -4465,11 +4484,11 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_instance_init
 	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_GET_PRIVATE (self);
 #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->pane_widget = NULL;
-#line 4451 "TumblrPublishing.c"
+#line 4470 "TumblrPublishing.c"
 }
 
 
-static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GObject* obj) {
+static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GObject * obj) {
 	PublishingTumblrTumblrPublisherAuthenticationPane * self;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
@@ -4485,7 +4504,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GOb
 	_g_object_unref0 (self->priv->login_button);
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_authentication_pane_parent_class)->finalize (obj);
-#line 4471 "TumblrPublishing.c"
+#line 4490 "TumblrPublishing.c"
 }
 
 
@@ -4510,7 +4529,7 @@ GType publishing_tumblr_tumblr_publisher_authentication_pane_get_type (void) {
 static gpointer _publishing_tumblr_size_entry_ref0 (gpointer self) {
 #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self ? publishing_tumblr_size_entry_ref (self) : NULL;
-#line 4496 "TumblrPublishing.c"
+#line 4515 "TumblrPublishing.c"
 }
 
 
@@ -4521,24 +4540,24 @@ static PublishingTumblrSizeEntry** _vala_array_dup7 (PublishingTumblrSizeEntry**
 	result = g_new0 (PublishingTumblrSizeEntry*, length + 1);
 #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 4507 "TumblrPublishing.c"
-		PublishingTumblrSizeEntry* _tmp0_ = NULL;
+#line 4526 "TumblrPublishing.c"
+		PublishingTumblrSizeEntry* _tmp0_;
 #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = _publishing_tumblr_size_entry_ref0 (self[i]);
 #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		result[i] = _tmp0_;
-#line 4513 "TumblrPublishing.c"
+#line 4532 "TumblrPublishing.c"
 	}
 #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 4517 "TumblrPublishing.c"
+#line 4536 "TumblrPublishing.c"
 }
 
 
 static gpointer _publishing_tumblr_blog_entry_ref0 (gpointer self) {
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self ? publishing_tumblr_blog_entry_ref (self) : NULL;
-#line 4524 "TumblrPublishing.c"
+#line 4543 "TumblrPublishing.c"
 }
 
 
@@ -4549,64 +4568,64 @@ static PublishingTumblrBlogEntry** _vala_array_dup8 (PublishingTumblrBlogEntry**
 	result = g_new0 (PublishingTumblrBlogEntry*, length + 1);
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 4535 "TumblrPublishing.c"
-		PublishingTumblrBlogEntry* _tmp0_ = NULL;
+#line 4554 "TumblrPublishing.c"
+		PublishingTumblrBlogEntry* _tmp0_;
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = _publishing_tumblr_blog_entry_ref0 (self[i]);
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		result[i] = _tmp0_;
-#line 4541 "TumblrPublishing.c"
+#line 4560 "TumblrPublishing.c"
 	}
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 4545 "TumblrPublishing.c"
+#line 4564 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 4552 "TumblrPublishing.c"
+#line 4571 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 4559 "TumblrPublishing.c"
+#line 4578 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 4566 "TumblrPublishing.c"
+#line 4585 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 4573 "TumblrPublishing.c"
+#line 4592 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (GType object_type, PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username) {
 	PublishingTumblrTumblrPublisherPublishingOptionsPane * self = NULL;
-	GtkBox* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	PublishingTumblrTumblrPublisher* _tmp3_ = NULL;
-	PublishingTumblrTumblrPublisher* _tmp4_ = NULL;
-	SpitPublishingPublisherMediaType _tmp5_ = 0;
-	PublishingTumblrSizeEntry** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	PublishingTumblrSizeEntry** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	PublishingTumblrBlogEntry** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	PublishingTumblrBlogEntry** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
+	GtkBox* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	PublishingTumblrTumblrPublisher* _tmp3_;
+	PublishingTumblrTumblrPublisher* _tmp4_;
+	SpitPublishingPublisherMediaType _tmp5_;
+	PublishingTumblrSizeEntry** _tmp6_;
+	gint _tmp6__length1;
+	PublishingTumblrSizeEntry** _tmp7_;
+	gint _tmp7__length1;
+	PublishingTumblrBlogEntry** _tmp8_;
+	gint _tmp8__length1;
+	PublishingTumblrBlogEntry** _tmp9_;
+	gint _tmp9__length1;
 	GError * _inner_error_ = NULL;
 #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (publisher), NULL);
@@ -4674,45 +4693,44 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p
 	self->priv->blogs_length1 = _tmp9__length1;
 #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->_blogs_size_ = self->priv->blogs_length1;
-#line 4660 "TumblrPublishing.c"
+#line 4679 "TumblrPublishing.c"
 	{
-		GtkBuilder* _tmp10_ = NULL;
-		GtkBuilder* _tmp11_ = NULL;
-		GtkBuilder* _tmp12_ = NULL;
-		GtkBuilder* _tmp13_ = NULL;
-		GObject* _tmp14_ = NULL;
-		GtkBox* _tmp15_ = NULL;
-		GtkBuilder* _tmp16_ = NULL;
-		GObject* _tmp17_ = NULL;
-		GtkLabel* _tmp18_ = NULL;
-		GtkBuilder* _tmp19_ = NULL;
-		GObject* _tmp20_ = NULL;
-		GtkButton* _tmp21_ = NULL;
-		GtkBuilder* _tmp22_ = NULL;
-		GObject* _tmp23_ = NULL;
-		GtkButton* _tmp24_ = NULL;
-		GtkBuilder* _tmp25_ = NULL;
-		GObject* _tmp26_ = NULL;
-		GtkComboBoxText* _tmp27_ = NULL;
-		GtkBuilder* _tmp28_ = NULL;
-		GObject* _tmp29_ = NULL;
-		GtkLabel* _tmp30_ = NULL;
-		GtkBuilder* _tmp31_ = NULL;
-		GObject* _tmp32_ = NULL;
-		GtkComboBoxText* _tmp33_ = NULL;
-		GtkBuilder* _tmp34_ = NULL;
-		GObject* _tmp35_ = NULL;
-		GtkLabel* _tmp36_ = NULL;
+		GtkBuilder* _tmp10_;
+		GtkBuilder* _tmp11_;
+		GtkBuilder* _tmp12_;
+		GtkBuilder* _tmp13_;
+		GObject* _tmp14_;
+		GtkBox* _tmp15_;
+		GtkBuilder* _tmp16_;
+		GObject* _tmp17_;
+		GtkLabel* _tmp18_;
+		GtkBuilder* _tmp19_;
+		GObject* _tmp20_;
+		GtkButton* _tmp21_;
+		GtkBuilder* _tmp22_;
+		GObject* _tmp23_;
+		GtkButton* _tmp24_;
+		GtkBuilder* _tmp25_;
+		GObject* _tmp26_;
+		GtkComboBoxText* _tmp27_;
+		GtkBuilder* _tmp28_;
+		GObject* _tmp29_;
+		GtkLabel* _tmp30_;
+		GtkBuilder* _tmp31_;
+		GObject* _tmp32_;
+		GtkComboBoxText* _tmp33_;
+		GtkBuilder* _tmp34_;
+		GObject* _tmp35_;
+		GtkLabel* _tmp36_;
 		gchar* upload_label_text = NULL;
-		const gchar* _tmp37_ = NULL;
-		const gchar* _tmp38_ = NULL;
-		gchar* _tmp39_ = NULL;
-		GtkLabel* _tmp40_ = NULL;
-		const gchar* _tmp41_ = NULL;
-		GtkComboBoxText* _tmp42_ = NULL;
-		SpitPublishingPublisherMediaType _tmp43_ = 0;
-		GtkButton* _tmp47_ = NULL;
-		GtkButton* _tmp48_ = NULL;
+		const gchar* _tmp37_;
+		gchar* _tmp38_;
+		GtkLabel* _tmp39_;
+		const gchar* _tmp40_;
+		GtkComboBoxText* _tmp41_;
+		SpitPublishingPublisherMediaType _tmp42_;
+		GtkButton* _tmp46_;
+		GtkButton* _tmp47_;
 #line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp10_ = gtk_builder_new ();
 #line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4725,7 +4743,7 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p
 		gtk_builder_add_from_resource (_tmp11_, PLUGIN_RESOURCE_PATH "/tumblr_publishing_options_pane.ui", &_inner_error_);
 #line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4711 "TumblrPublishing.c"
+#line 4729 "TumblrPublishing.c"
 			goto __catch37_g_error;
 		}
 #line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4813,85 +4831,80 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p
 #line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		self->priv->blog_label = _tmp36_;
 #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp37_ = _ ("You are logged into Tumblr as %s.\n\n");
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp38_ = self->priv->username;
+		_tmp37_ = self->priv->username;
 #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp39_ = g_strdup_printf (_tmp37_, _tmp38_);
+		_tmp38_ = g_strdup_printf (_ ("You are logged into Tumblr as %s.\n\n"), _tmp37_);
 #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		upload_label_text = _tmp39_;
+		upload_label_text = _tmp38_;
 #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp40_ = self->priv->upload_info_label;
+		_tmp39_ = self->priv->upload_info_label;
 #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp41_ = upload_label_text;
+		_tmp40_ = upload_label_text;
 #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_label_set_label (_tmp40_, _tmp41_);
+		gtk_label_set_label (_tmp39_, _tmp40_);
 #line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (self);
 #line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp42_ = self->priv->blog_combo;
+		_tmp41_ = self->priv->blog_combo;
 #line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed, self, 0);
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed, self, 0);
 #line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp43_ = media_type;
+		_tmp42_ = media_type;
 #line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (_tmp43_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4822 "TumblrPublishing.c"
-			GtkComboBoxText* _tmp44_ = NULL;
+		if (_tmp42_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 4838 "TumblrPublishing.c"
+			GtkComboBoxText* _tmp43_;
 #line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (self);
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp44_ = self->priv->size_combo;
+			_tmp43_ = self->priv->size_combo;
 #line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
-#line 4830 "TumblrPublishing.c"
+			g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
+#line 4846 "TumblrPublishing.c"
 		} else {
-			GtkComboBoxText* _tmp45_ = NULL;
-			GtkLabel* _tmp46_ = NULL;
+			GtkComboBoxText* _tmp44_;
+			GtkLabel* _tmp45_;
 #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp45_ = self->priv->size_combo;
+			_tmp44_ = self->priv->size_combo;
 #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE);
+			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp46_ = self->priv->size_label;
+			_tmp45_ = self->priv->size_label;
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 4842 "TumblrPublishing.c"
+			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 4858 "TumblrPublishing.c"
 		}
 #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp47_ = self->priv->logout_button;
+		_tmp46_ = self->priv->logout_button;
 #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (_tmp47_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+		g_signal_connect_object (_tmp46_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp48_ = self->priv->publish_button;
+		_tmp47_ = self->priv->publish_button;
 #line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (_tmp48_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+		g_signal_connect_object (_tmp47_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
 #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (upload_label_text);
-#line 4854 "TumblrPublishing.c"
+#line 4870 "TumblrPublishing.c"
 	}
 	goto __finally37;
 	__catch37_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp49_ = NULL;
-		GError* _tmp50_ = NULL;
-		const gchar* _tmp51_ = NULL;
+		GError* _tmp48_;
+		const gchar* _tmp49_;
 #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		e = _inner_error_;
 #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_inner_error_ = NULL;
 #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp49_ = _ ("Could not load UI: %s");
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp50_ = e;
+		_tmp48_ = e;
 #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp51_ = _tmp50_->message;
+		_tmp49_ = _tmp48_->message;
 #line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_warning (_tmp49_, _tmp51_);
+		g_warning (_ ("Could not load UI: %s"), _tmp49_);
 #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_error_free0 (e);
-#line 4877 "TumblrPublishing.c"
+#line 4890 "TumblrPublishing.c"
 	}
 	__finally37:
 #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4902,18 +4915,18 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p
 		g_clear_error (&_inner_error_);
 #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return NULL;
-#line 4888 "TumblrPublishing.c"
+#line 4901 "TumblrPublishing.c"
 	}
 #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 4892 "TumblrPublishing.c"
+#line 4905 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_new (PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username) {
 #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, publisher, media_type, sizes, sizes_length1, blogs, blogs_length1, username);
-#line 4899 "TumblrPublishing.c"
+#line 4912 "TumblrPublishing.c"
 }
 
 
@@ -4921,8 +4934,8 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout
 #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_emit_by_name (self, "logout");
-#line 4908 "TumblrPublishing.c"
+	g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
+#line 4921 "TumblrPublishing.c"
 }
 
 
@@ -4930,14 +4943,14 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publis
 #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_emit_by_name (self, "publish");
-#line 4917 "TumblrPublishing.c"
+	g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
+#line 4930 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-	PublishingTumblrBlogEntry** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	PublishingTumblrBlogEntry** _tmp0_;
+	gint _tmp0__length1;
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4946,17 +4959,17 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
 	_tmp0__length1 = self->priv->blogs_length1;
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 4932 "TumblrPublishing.c"
-		PublishingTumblrBlogEntry** _tmp1_ = NULL;
-		gint _tmp1__length1 = 0;
-		GtkComboBoxText* _tmp6_ = NULL;
-		PublishingTumblrTumblrPublisher* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
+#line 4945 "TumblrPublishing.c"
+		PublishingTumblrBlogEntry** _tmp1_;
+		gint _tmp1__length1;
+		GtkComboBoxText* _tmp6_;
+		PublishingTumblrTumblrPublisher* _tmp7_;
+		gint _tmp8_;
 #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp1_ = self->priv->blogs;
 #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp1__length1 = self->priv->blogs_length1;
-#line 4942 "TumblrPublishing.c"
+#line 4955 "TumblrPublishing.c"
 		{
 			PublishingTumblrBlogEntry** b_collection = NULL;
 			gint b_collection_length1 = 0;
@@ -4968,18 +4981,18 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
 			b_collection_length1 = _tmp1__length1;
 #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			for (b_it = 0; b_it < _tmp1__length1; b_it = b_it + 1) {
-#line 4954 "TumblrPublishing.c"
-				PublishingTumblrBlogEntry* _tmp2_ = NULL;
+#line 4967 "TumblrPublishing.c"
+				PublishingTumblrBlogEntry* _tmp2_;
 				PublishingTumblrBlogEntry* b = NULL;
 #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp2_ = _publishing_tumblr_blog_entry_ref0 (b_collection[b_it]);
 #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				b = _tmp2_;
-#line 4961 "TumblrPublishing.c"
+#line 4974 "TumblrPublishing.c"
 				{
-					GtkComboBoxText* _tmp3_ = NULL;
-					PublishingTumblrBlogEntry* _tmp4_ = NULL;
-					const gchar* _tmp5_ = NULL;
+					GtkComboBoxText* _tmp3_;
+					PublishingTumblrBlogEntry* _tmp4_;
+					const gchar* _tmp5_;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp3_ = self->priv->blog_combo;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4990,7 +5003,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
 					gtk_combo_box_text_append_text (_tmp3_, _tmp5_);
 #line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_publishing_tumblr_blog_entry_unref0 (b);
-#line 4976 "TumblrPublishing.c"
+#line 4989 "TumblrPublishing.c"
 				}
 			}
 		}
@@ -5002,15 +5015,15 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
 		_tmp8_ = publishing_tumblr_tumblr_publisher_get_persistent_default_blog (_tmp7_);
 #line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), _tmp8_);
-#line 4988 "TumblrPublishing.c"
+#line 5001 "TumblrPublishing.c"
 	}
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-	PublishingTumblrTumblrPublisher* _tmp0_ = NULL;
-	GtkComboBoxText* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	PublishingTumblrTumblrPublisher* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	gint _tmp2_;
 #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -5021,13 +5034,13 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_c
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_set_persistent_default_blog (_tmp0_, _tmp2_);
-#line 5007 "TumblrPublishing.c"
+#line 5020 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-	PublishingTumblrSizeEntry** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	PublishingTumblrSizeEntry** _tmp0_;
+	gint _tmp0__length1;
 #line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -5036,17 +5049,17 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
 	_tmp0__length1 = self->priv->sizes_length1;
 #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 5022 "TumblrPublishing.c"
-		PublishingTumblrSizeEntry** _tmp1_ = NULL;
-		gint _tmp1__length1 = 0;
-		GtkComboBoxText* _tmp6_ = NULL;
-		PublishingTumblrTumblrPublisher* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
+#line 5035 "TumblrPublishing.c"
+		PublishingTumblrSizeEntry** _tmp1_;
+		gint _tmp1__length1;
+		GtkComboBoxText* _tmp6_;
+		PublishingTumblrTumblrPublisher* _tmp7_;
+		gint _tmp8_;
 #line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp1_ = self->priv->sizes;
 #line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp1__length1 = self->priv->sizes_length1;
-#line 5032 "TumblrPublishing.c"
+#line 5045 "TumblrPublishing.c"
 		{
 			PublishingTumblrSizeEntry** e_collection = NULL;
 			gint e_collection_length1 = 0;
@@ -5058,18 +5071,18 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
 			e_collection_length1 = _tmp1__length1;
 #line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			for (e_it = 0; e_it < _tmp1__length1; e_it = e_it + 1) {
-#line 5044 "TumblrPublishing.c"
-				PublishingTumblrSizeEntry* _tmp2_ = NULL;
+#line 5057 "TumblrPublishing.c"
+				PublishingTumblrSizeEntry* _tmp2_;
 				PublishingTumblrSizeEntry* e = NULL;
 #line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp2_ = _publishing_tumblr_size_entry_ref0 (e_collection[e_it]);
 #line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				e = _tmp2_;
-#line 5051 "TumblrPublishing.c"
+#line 5064 "TumblrPublishing.c"
 				{
-					GtkComboBoxText* _tmp3_ = NULL;
-					PublishingTumblrSizeEntry* _tmp4_ = NULL;
-					const gchar* _tmp5_ = NULL;
+					GtkComboBoxText* _tmp3_;
+					PublishingTumblrSizeEntry* _tmp4_;
+					const gchar* _tmp5_;
 #line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp3_ = self->priv->size_combo;
 #line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -5080,7 +5093,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
 					gtk_combo_box_text_append_text (_tmp3_, _tmp5_);
 #line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_publishing_tumblr_size_entry_unref0 (e);
-#line 5066 "TumblrPublishing.c"
+#line 5079 "TumblrPublishing.c"
 				}
 			}
 		}
@@ -5092,15 +5105,15 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_
 		_tmp8_ = publishing_tumblr_tumblr_publisher_get_persistent_default_size (_tmp7_);
 #line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), _tmp8_);
-#line 5078 "TumblrPublishing.c"
+#line 5091 "TumblrPublishing.c"
 	}
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-	PublishingTumblrTumblrPublisher* _tmp0_ = NULL;
-	GtkComboBoxText* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	PublishingTumblrTumblrPublisher* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	gint _tmp2_;
 #line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -5111,7 +5124,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_c
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
 #line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 5097 "TumblrPublishing.c"
+#line 5110 "TumblrPublishing.c"
 }
 
 
@@ -5119,8 +5132,8 @@ void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish (
 #line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_emit_by_name (self, "publish");
-#line 5106 "TumblrPublishing.c"
+	g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
+#line 5119 "TumblrPublishing.c"
 }
 
 
@@ -5128,16 +5141,16 @@ void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout (P
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_emit_by_name (self, "logout");
-#line 5115 "TumblrPublishing.c"
+	g_signal_emit (self, publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
+#line 5128 "TumblrPublishing.c"
 }
 
 
 static GtkWidget* publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
 #line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -5148,7 +5161,7 @@ static GtkWidget* publishing_tumblr_tumblr_publisher_publishing_options_pane_rea
 	result = _tmp1_;
 #line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 5134 "TumblrPublishing.c"
+#line 5147 "TumblrPublishing.c"
 }
 
 
@@ -5161,21 +5174,21 @@ static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publishe
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 5147 "TumblrPublishing.c"
+#line 5160 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 5154 "TumblrPublishing.c"
+#line 5167 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
 #line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 5161 "TumblrPublishing.c"
+#line 5174 "TumblrPublishing.c"
 }
 
 
@@ -5187,14 +5200,14 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_p
 	g_signal_connect_object (self, "publish", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self, 0);
 #line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_connect_object (self, "logout", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self, 0);
-#line 5173 "TumblrPublishing.c"
+#line 5186 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
 	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
-	guint _tmp0_ = 0U;
-	guint _tmp1_ = 0U;
+	guint _tmp0_;
+	guint _tmp1_;
 #line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
 #line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -5205,7 +5218,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_p
 	g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
 #line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
-#line 5191 "TumblrPublishing.c"
+#line 5204 "TumblrPublishing.c"
 }
 
 
@@ -5217,10 +5230,10 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_class_ini
 #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize;
 #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_new ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_new ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 5206 "TumblrPublishing.c"
+	publishing_tumblr_tumblr_publisher_publishing_options_pane_signals[PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 5219 "TumblrPublishing.c"
 }
 
 
@@ -5228,19 +5241,19 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publ
 #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget;
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget;
 #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry;
 #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed;
+	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed;
 #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled;
-#line 5221 "TumblrPublishing.c"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled;
+#line 5234 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_init (PublishingTumblrTumblrPublisherPublishingOptionsPane * self) {
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
 #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -5277,11 +5290,11 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_
 	self->priv->username = _tmp0_;
 #line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->publisher = NULL;
-#line 5263 "TumblrPublishing.c"
+#line 5276 "TumblrPublishing.c"
 }
 
 
-static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject* obj) {
+static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject * obj) {
 	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
 #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
@@ -5313,7 +5326,7 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize
 	_g_object_unref0 (self->priv->publisher);
 #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class)->finalize (obj);
-#line 5299 "TumblrPublishing.c"
+#line 5312 "TumblrPublishing.c"
 }
 
 
@@ -5336,8 +5349,8 @@ GType publishing_tumblr_tumblr_publisher_publishing_options_pane_get_type (void)
 
 PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, PublishingRESTSupportHttpMethod method) {
 	PublishingTumblrTumblrPublisherTransaction* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp1_ = 0;
+	PublishingTumblrTumblrPublisherSession* _tmp0_;
+	PublishingRESTSupportHttpMethod _tmp1_;
 #line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
 #line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -5348,32 +5361,32 @@ PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_t
 	self = (PublishingTumblrTumblrPublisherTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_);
 #line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 5334 "TumblrPublishing.c"
+#line 5347 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_new (PublishingTumblrTumblrPublisherSession* session, PublishingRESTSupportHttpMethod method) {
 #line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, session, method);
-#line 5341 "TumblrPublishing.c"
+#line 5354 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (GType object_type, PublishingTumblrTumblrPublisherSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
 	PublishingTumblrTumblrPublisherTransaction* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp2_ = 0;
-	PublishingTumblrTumblrPublisherSession* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	PublishingTumblrTumblrPublisherSession* _tmp0_;
+	const gchar* _tmp1_;
+	PublishingRESTSupportHttpMethod _tmp2_;
+	PublishingTumblrTumblrPublisherSession* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	PublishingTumblrTumblrPublisherSession* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	PublishingTumblrTumblrPublisherSession* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	gboolean _tmp12_;
 #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
 #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -5424,10 +5437,10 @@ PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_t
 	_g_free0 (_tmp11_);
 #line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp12_) {
-#line 5410 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherSession* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
+#line 5423 "TumblrPublishing.c"
+		PublishingTumblrTumblrPublisherSession* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp13_ = session;
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -5438,25 +5451,25 @@ PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_t
 		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp15_);
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (_tmp15_);
-#line 5424 "TumblrPublishing.c"
+#line 5437 "TumblrPublishing.c"
 	}
 #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 5428 "TumblrPublishing.c"
+#line 5441 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_new_with_uri (PublishingTumblrTumblrPublisherSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
 #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, session, uri, method);
-#line 5435 "TumblrPublishing.c"
+#line 5448 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
 	PublishingTumblrTumblrPublisherTransaction * self;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp1_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingTumblrTumblrPublisherSession* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, PublishingTumblrTumblrPublisherTransaction);
@@ -5478,7 +5491,7 @@ static void publishing_tumblr_tumblr_publisher_transaction_real_execute (Publish
 			g_propagate_error (error, _inner_error_);
 #line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 5464 "TumblrPublishing.c"
+#line 5477 "TumblrPublishing.c"
 		} else {
 #line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5486,7 +5499,7 @@ static void publishing_tumblr_tumblr_publisher_transaction_real_execute (Publish
 			g_clear_error (&_inner_error_);
 #line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 5472 "TumblrPublishing.c"
+#line 5485 "TumblrPublishing.c"
 		}
 	}
 }
@@ -5496,8 +5509,8 @@ static void publishing_tumblr_tumblr_publisher_transaction_class_init (Publishin
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_transaction_parent_class = g_type_class_peek_parent (klass);
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_tumblr_tumblr_publisher_transaction_real_execute;
-#line 5483 "TumblrPublishing.c"
+	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_tumblr_tumblr_publisher_transaction_real_execute;
+#line 5496 "TumblrPublishing.c"
 }
 
 
@@ -5519,11 +5532,11 @@ GType publishing_tumblr_tumblr_publisher_transaction_get_type (void) {
 
 PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, const gchar* username, const gchar* password) {
 	PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	PublishingTumblrTumblrPublisherSession* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -5552,21 +5565,21 @@ PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tu
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_mode", "client_auth");
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 5538 "TumblrPublishing.c"
+#line 5551 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_new (PublishingTumblrTumblrPublisherSession* session, const gchar* username, const gchar* password) {
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, username, password);
-#line 5545 "TumblrPublishing.c"
+#line 5558 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_class_init (PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass * klass) {
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 5552 "TumblrPublishing.c"
+#line 5565 "TumblrPublishing.c"
 }
 
 
@@ -5588,7 +5601,7 @@ GType publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_get_type
 
 PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session) {
 	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL;
+	PublishingTumblrTumblrPublisherSession* _tmp0_;
 #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
 #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -5597,21 +5610,21 @@ PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumbl
 	self = (PublishingTumblrTumblrPublisherUserInfoFetchTransaction*) publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (object_type, _tmp0_, "https://api.tumblr.com/v2/user/info", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 5583 "TumblrPublishing.c"
+#line 5596 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (PublishingTumblrTumblrPublisherSession* session) {
 #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, session);
-#line 5590 "TumblrPublishing.c"
+#line 5603 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_class_init (PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass * klass) {
 #line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 5597 "TumblrPublishing.c"
+#line 5610 "TumblrPublishing.c"
 }
 
 
@@ -5634,19 +5647,19 @@ GType publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_get_type (v
 static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (PublishingTumblrTumblrPublisherUploadTransaction* self, guint8* data, int data_length1) {
 	gchar* result = NULL;
 	GString* s = NULL;
-	GString* _tmp0_ = NULL;
+	GString* _tmp0_;
 	gchar* bytes = NULL;
-	gchar* _tmp1_ = NULL;
-	gint bytes_length1 = 0;
-	gint _bytes_size_ = 0;
-	gchar* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	gchar _tmp3_ = '\0';
-	guint8* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	GString* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
+	gchar* _tmp1_;
+	gint bytes_length1;
+	gint _bytes_size_;
+	gchar* _tmp2_;
+	gint _tmp2__length1;
+	gchar _tmp3_;
+	guint8* _tmp4_;
+	gint _tmp4__length1;
+	GString* _tmp14_;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
 #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
 #line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -5673,7 +5686,7 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ
 	_tmp4_ = data;
 #line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp4__length1 = data_length1;
-#line 5659 "TumblrPublishing.c"
+#line 5672 "TumblrPublishing.c"
 	{
 		guint8* byte_collection = NULL;
 		gint byte_collection_length1 = 0;
@@ -5685,34 +5698,34 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ
 		byte_collection_length1 = _tmp4__length1;
 #line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		for (byte_it = 0; byte_it < _tmp4__length1; byte_it = byte_it + 1) {
-#line 5671 "TumblrPublishing.c"
+#line 5684 "TumblrPublishing.c"
 			guint8 byte = 0U;
 #line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			byte = byte_collection[byte_it];
-#line 5675 "TumblrPublishing.c"
+#line 5688 "TumblrPublishing.c"
 			{
-				guint8 _tmp5_ = 0U;
+				guint8 _tmp5_;
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp5_ = byte;
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (((gint) _tmp5_) == 0) {
-#line 5682 "TumblrPublishing.c"
-					GString* _tmp6_ = NULL;
+#line 5695 "TumblrPublishing.c"
+					GString* _tmp6_;
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp6_ = s;
 #line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					g_string_append (_tmp6_, "%00");
-#line 5688 "TumblrPublishing.c"
+#line 5701 "TumblrPublishing.c"
 				} else {
-					gchar* _tmp7_ = NULL;
-					gint _tmp7__length1 = 0;
-					guint8 _tmp8_ = 0U;
-					gchar _tmp9_ = '\0';
-					GString* _tmp10_ = NULL;
-					gchar* _tmp11_ = NULL;
-					gint _tmp11__length1 = 0;
-					gchar* _tmp12_ = NULL;
-					gchar* _tmp13_ = NULL;
+					gchar* _tmp7_;
+					gint _tmp7__length1;
+					guint8 _tmp8_;
+					gchar _tmp9_;
+					GString* _tmp10_;
+					gchar* _tmp11_;
+					gint _tmp11__length1;
+					gchar* _tmp12_;
+					gchar* _tmp13_;
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp7_ = bytes;
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -5737,7 +5750,7 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ
 					g_string_append (_tmp10_, _tmp13_);
 #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_g_free0 (_tmp13_);
-#line 5723 "TumblrPublishing.c"
+#line 5736 "TumblrPublishing.c"
 				}
 			}
 		}
@@ -5756,26 +5769,26 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ
 	_g_string_free0 (s);
 #line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 5742 "TumblrPublishing.c"
+#line 5755 "TumblrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 5749 "TumblrPublishing.c"
+#line 5762 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url) {
 	PublishingTumblrTumblrPublisherUploadTransaction* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL;
-	SpitPublishingPublishable* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp5_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp6_ = NULL;
+	PublishingTumblrTumblrPublisherSession* _tmp0_;
+	SpitPublishingPublishable* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	PublishingTumblrTumblrPublisherSession* _tmp5_;
+	PublishingTumblrTumblrPublisherSession* _tmp6_;
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -5808,40 +5821,40 @@ PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publi
 	self->priv->session = _tmp6_;
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 5794 "TumblrPublishing.c"
+#line 5807 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url) {
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_upload_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, session, publishable, blog_url);
-#line 5801 "TumblrPublishing.c"
+#line 5814 "TumblrPublishing.c"
 }
 
 
-static void _vala_array_add22 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
+static void _vala_array_add22 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
 #line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 5812 "TumblrPublishing.c"
+#line 5825 "TumblrPublishing.c"
 	}
 #line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5818 "TumblrPublishing.c"
+#line 5831 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (PublishingTumblrTumblrPublisherUploadTransaction* self, const gchar* key, const gchar* value) {
-	PublishingRESTSupportArgument** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingRESTSupportArgument* _tmp3_ = NULL;
+	PublishingRESTSupportArgument** _tmp0_;
+	gint _tmp0__length1;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingRESTSupportArgument* _tmp3_;
 #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self));
 #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -5860,14 +5873,14 @@ void publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_hea
 	_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
 #line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_vala_array_add22 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_);
-#line 5846 "TumblrPublishing.c"
+#line 5859 "TumblrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
 #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 5853 "TumblrPublishing.c"
+#line 5866 "TumblrPublishing.c"
 }
 
 
@@ -5878,28 +5891,28 @@ static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportAr
 	result = g_new0 (PublishingRESTSupportArgument*, length + 1);
 #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 5864 "TumblrPublishing.c"
-		PublishingRESTSupportArgument* _tmp0_ = NULL;
+#line 5877 "TumblrPublishing.c"
+		PublishingRESTSupportArgument* _tmp0_;
 #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
 #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		result[i] = _tmp0_;
-#line 5870 "TumblrPublishing.c"
+#line 5883 "TumblrPublishing.c"
 	}
 #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 5874 "TumblrPublishing.c"
+#line 5887 "TumblrPublishing.c"
 }
 
 
 PublishingRESTSupportArgument** publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_fields (PublishingTumblrTumblrPublisherUploadTransaction* self, int* result_length1) {
 	PublishingRESTSupportArgument** result = NULL;
-	PublishingRESTSupportArgument** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	PublishingRESTSupportArgument** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingRESTSupportArgument** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	PublishingRESTSupportArgument** _tmp0_;
+	gint _tmp0__length1;
+	PublishingRESTSupportArgument** _tmp1_;
+	gint _tmp1__length1;
+	PublishingRESTSupportArgument** _tmp2_;
+	gint _tmp2__length1;
 #line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
 #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -5918,74 +5931,74 @@ PublishingRESTSupportArgument** publishing_tumblr_tumblr_publisher_upload_transa
 	if (result_length1) {
 #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*result_length1 = _tmp2__length1;
-#line 5904 "TumblrPublishing.c"
+#line 5917 "TumblrPublishing.c"
 	}
 #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = _tmp2_;
 #line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 5910 "TumblrPublishing.c"
+#line 5923 "TumblrPublishing.c"
 }
 
 
 gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_string (PublishingTumblrTumblrPublisherUploadTransaction* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
 #line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = g_strdup ("OAuth ");
 #line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_result_ = _tmp0_;
-#line 5924 "TumblrPublishing.c"
+#line 5937 "TumblrPublishing.c"
 	{
 		gint i = 0;
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		i = 0;
-#line 5929 "TumblrPublishing.c"
+#line 5942 "TumblrPublishing.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_tmp1_ = TRUE;
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			while (TRUE) {
-#line 5936 "TumblrPublishing.c"
-				gint _tmp3_ = 0;
-				PublishingRESTSupportArgument** _tmp4_ = NULL;
-				gint _tmp4__length1 = 0;
-				const gchar* _tmp5_ = NULL;
-				PublishingRESTSupportArgument** _tmp6_ = NULL;
-				gint _tmp6__length1 = 0;
-				gint _tmp7_ = 0;
-				PublishingRESTSupportArgument* _tmp8_ = NULL;
-				const gchar* _tmp9_ = NULL;
-				gchar* _tmp10_ = NULL;
-				const gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
-				const gchar* _tmp13_ = NULL;
-				PublishingRESTSupportArgument** _tmp14_ = NULL;
-				gint _tmp14__length1 = 0;
-				gint _tmp15_ = 0;
-				PublishingRESTSupportArgument* _tmp16_ = NULL;
-				const gchar* _tmp17_ = NULL;
-				gchar* _tmp18_ = NULL;
-				gchar* _tmp19_ = NULL;
-				gchar* _tmp20_ = NULL;
-				gchar* _tmp21_ = NULL;
-				gchar* _tmp22_ = NULL;
-				gint _tmp23_ = 0;
-				PublishingRESTSupportArgument** _tmp24_ = NULL;
-				gint _tmp24__length1 = 0;
+#line 5949 "TumblrPublishing.c"
+				gint _tmp3_;
+				PublishingRESTSupportArgument** _tmp4_;
+				gint _tmp4__length1;
+				const gchar* _tmp5_;
+				PublishingRESTSupportArgument** _tmp6_;
+				gint _tmp6__length1;
+				gint _tmp7_;
+				PublishingRESTSupportArgument* _tmp8_;
+				const gchar* _tmp9_;
+				gchar* _tmp10_;
+				const gchar* _tmp11_;
+				gchar* _tmp12_;
+				const gchar* _tmp13_;
+				PublishingRESTSupportArgument** _tmp14_;
+				gint _tmp14__length1;
+				gint _tmp15_;
+				PublishingRESTSupportArgument* _tmp16_;
+				const gchar* _tmp17_;
+				gchar* _tmp18_;
+				gchar* _tmp19_;
+				gchar* _tmp20_;
+				gchar* _tmp21_;
+				gchar* _tmp22_;
+				gint _tmp23_;
+				PublishingRESTSupportArgument** _tmp24_;
+				gint _tmp24__length1;
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (!_tmp1_) {
-#line 5965 "TumblrPublishing.c"
-					gint _tmp2_ = 0;
+#line 5978 "TumblrPublishing.c"
+					gint _tmp2_;
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp2_ = i;
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					i = _tmp2_ + 1;
-#line 5971 "TumblrPublishing.c"
+#line 5984 "TumblrPublishing.c"
 				}
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp1_ = FALSE;
@@ -5999,7 +6012,7 @@ gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_h
 				if (!(_tmp3_ < _tmp4__length1)) {
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					break;
-#line 5985 "TumblrPublishing.c"
+#line 5998 "TumblrPublishing.c"
 				}
 #line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp5_ = _result_;
@@ -6065,9 +6078,9 @@ gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_h
 				_tmp24__length1 = self->priv->auth_header_fields_length1;
 #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (_tmp23_ < (_tmp24__length1 - 1)) {
-#line 6051 "TumblrPublishing.c"
-					const gchar* _tmp25_ = NULL;
-					gchar* _tmp26_ = NULL;
+#line 6064 "TumblrPublishing.c"
+					const gchar* _tmp25_;
+					gchar* _tmp26_;
 #line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp25_ = _result_;
 #line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -6076,7 +6089,7 @@ gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_h
 					_g_free0 (_result_);
 #line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_result_ = _tmp26_;
-#line 6062 "TumblrPublishing.c"
+#line 6075 "TumblrPublishing.c"
 				}
 			}
 		}
@@ -6085,515 +6098,515 @@ gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_h
 	result = _result_;
 #line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 6071 "TumblrPublishing.c"
+#line 6084 "TumblrPublishing.c"
 }
 
 
 static guint8* string_get_data (const gchar* self, int* result_length1) {
 	guint8* result;
 	guint8* res = NULL;
-	gint res_length1 = 0;
-	gint _res_size_ = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	guint8* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	guint8* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint res_length1;
+	gint _res_size_;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	guint8* _tmp3_;
+	gint _tmp3__length1;
+	guint8* _tmp4_;
+	gint _tmp4__length1;
+#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 6115 "TumblrPublishing.c"
+#line 6128 "TumblrPublishing.c"
 	}
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 6121 "TumblrPublishing.c"
+#line 6134 "TumblrPublishing.c"
 }
 
 
 static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		separator = "";
-#line 6138 "TumblrPublishing.c"
+#line 6151 "TumblrPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
-#line 6148 "TumblrPublishing.c"
+#line 6161 "TumblrPublishing.c"
 	} else {
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp4_;
+		gint _tmp4__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
-#line 6158 "TumblrPublishing.c"
+#line 6171 "TumblrPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 6164 "TumblrPublishing.c"
+#line 6177 "TumblrPublishing.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
-#line 6175 "TumblrPublishing.c"
-			gchar** _tmp7_ = NULL;
-			gint _tmp7__length1 = 0;
-			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 6188 "TumblrPublishing.c"
+			gchar** _tmp7_;
+			gint _tmp7__length1;
+			const gchar* _tmp8_;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
-#line 6187 "TumblrPublishing.c"
+#line 6200 "TumblrPublishing.c"
 		} else {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
-#line 6191 "TumblrPublishing.c"
+#line 6204 "TumblrPublishing.c"
 		}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
-#line 6195 "TumblrPublishing.c"
+#line 6208 "TumblrPublishing.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 6199 "TumblrPublishing.c"
+#line 6212 "TumblrPublishing.c"
 		gint i = 0;
 		gsize len = 0UL;
-		gint _tmp31_ = 0;
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
-		gsize _tmp35_ = 0UL;
-		const gchar* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
-		gint _tmp39_ = 0;
+		gint _tmp31_;
+		gint _tmp33_;
+		gint _tmp34_;
+		gsize _tmp35_;
+		const gchar* _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
+		gint _tmp39_;
 		const gchar* res = NULL;
-		gsize _tmp40_ = 0UL;
-		void* _tmp41_ = NULL;
+		gsize _tmp40_;
+		void* _tmp41_;
 		void* ptr = NULL;
-		const gchar* _tmp42_ = NULL;
-		gchar** _tmp43_ = NULL;
-		gint _tmp43__length1 = 0;
-		const gchar* _tmp44_ = NULL;
-		void* _tmp45_ = NULL;
-		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp42_;
+		gchar** _tmp43_;
+		gint _tmp43__length1;
+		const gchar* _tmp44_;
+		void* _tmp45_;
+		const gchar* _tmp62_;
+#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
-#line 6222 "TumblrPublishing.c"
+#line 6235 "TumblrPublishing.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 6231 "TumblrPublishing.c"
+#line 6244 "TumblrPublishing.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
+				gchar** _tmp13_;
+				gint _tmp13__length1;
 				gint _tmp21_ = 0;
-				gchar** _tmp22_ = NULL;
-				gint _tmp22__length1 = 0;
-				gint _tmp23_ = 0;
-				const gchar* _tmp24_ = NULL;
-				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp22_;
+				gint _tmp22__length1;
+				gint _tmp23_;
+				const gchar* _tmp24_;
+				gsize _tmp30_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
-#line 6244 "TumblrPublishing.c"
-					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 6257 "TumblrPublishing.c"
+					gint _tmp10_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
-#line 6250 "TumblrPublishing.c"
+#line 6263 "TumblrPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
-#line 6260 "TumblrPublishing.c"
-					gint _tmp14_ = 0;
-					gchar** _tmp15_ = NULL;
-					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 6273 "TumblrPublishing.c"
+					gint _tmp14_;
+					gchar** _tmp15_;
+					gint _tmp15__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 6272 "TumblrPublishing.c"
+#line 6285 "TumblrPublishing.c"
 				} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
-#line 6276 "TumblrPublishing.c"
+#line 6289 "TumblrPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
-#line 6282 "TumblrPublishing.c"
+#line 6295 "TumblrPublishing.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_ = NULL;
-					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp17_;
+					gint _tmp17__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
-#line 6293 "TumblrPublishing.c"
-						gchar** _tmp18_ = NULL;
-						gint _tmp18__length1 = 0;
-						gint _tmp19_ = 0;
-						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 6306 "TumblrPublishing.c"
+						gchar** _tmp18_;
+						gint _tmp18__length1;
+						gint _tmp19_;
+						const gchar* _tmp20_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
-#line 6308 "TumblrPublishing.c"
+#line 6321 "TumblrPublishing.c"
 					} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
-#line 6312 "TumblrPublishing.c"
+#line 6325 "TumblrPublishing.c"
 					}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
-#line 6316 "TumblrPublishing.c"
+#line 6329 "TumblrPublishing.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
-#line 6322 "TumblrPublishing.c"
+#line 6335 "TumblrPublishing.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
-#line 6334 "TumblrPublishing.c"
-					gchar** _tmp25_ = NULL;
-					gint _tmp25__length1 = 0;
-					gint _tmp26_ = 0;
-					const gchar* _tmp27_ = NULL;
-					gint _tmp28_ = 0;
-					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 6347 "TumblrPublishing.c"
+					gchar** _tmp25_;
+					gint _tmp25__length1;
+					gint _tmp26_;
+					const gchar* _tmp27_;
+					gint _tmp28_;
+					gint _tmp29_;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
-#line 6355 "TumblrPublishing.c"
+#line 6368 "TumblrPublishing.c"
 				} else {
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
-#line 6359 "TumblrPublishing.c"
+#line 6372 "TumblrPublishing.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
-#line 6365 "TumblrPublishing.c"
+#line 6378 "TumblrPublishing.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
-#line 6372 "TumblrPublishing.c"
-			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 6385 "TumblrPublishing.c"
+			gchar* _tmp32_;
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return result;
-#line 6380 "TumblrPublishing.c"
+#line 6393 "TumblrPublishing.c"
 		}
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
-#line 6418 "TumblrPublishing.c"
+#line 6431 "TumblrPublishing.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 6427 "TumblrPublishing.c"
-				gint _tmp48_ = 0;
-				gchar** _tmp49_ = NULL;
-				gint _tmp49__length1 = 0;
-				void* _tmp50_ = NULL;
-				const gchar* _tmp51_ = NULL;
-				void* _tmp52_ = NULL;
+#line 6440 "TumblrPublishing.c"
+				gint _tmp48_;
+				gchar** _tmp49_;
+				gint _tmp49__length1;
+				void* _tmp50_;
+				const gchar* _tmp51_;
+				void* _tmp52_;
 				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_ = NULL;
-				gint _tmp54__length1 = 0;
-				gint _tmp55_ = 0;
-				const gchar* _tmp56_ = NULL;
-				void* _tmp60_ = NULL;
-				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp54_;
+				gint _tmp54__length1;
+				gint _tmp55_;
+				const gchar* _tmp56_;
+				void* _tmp60_;
+				void* _tmp61_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
-#line 6443 "TumblrPublishing.c"
-					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 6456 "TumblrPublishing.c"
+					gint _tmp47_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
-#line 6449 "TumblrPublishing.c"
+#line 6462 "TumblrPublishing.c"
 				}
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
-#line 6463 "TumblrPublishing.c"
+#line 6476 "TumblrPublishing.c"
 				}
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
-#line 6483 "TumblrPublishing.c"
-					gchar** _tmp57_ = NULL;
-					gint _tmp57__length1 = 0;
-					gint _tmp58_ = 0;
-					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 6496 "TumblrPublishing.c"
+					gchar** _tmp57_;
+					gint _tmp57__length1;
+					gint _tmp58_;
+					const gchar* _tmp59_;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
-#line 6498 "TumblrPublishing.c"
+#line 6511 "TumblrPublishing.c"
 				} else {
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
-#line 6502 "TumblrPublishing.c"
+#line 6515 "TumblrPublishing.c"
 				}
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
-#line 6510 "TumblrPublishing.c"
+#line 6523 "TumblrPublishing.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 6521 "TumblrPublishing.c"
+#line 6534 "TumblrPublishing.c"
 	} else {
-		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp63_;
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 6530 "TumblrPublishing.c"
+#line 6543 "TumblrPublishing.c"
 	}
 }
 
 
 static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
 	PublishingTumblrTumblrPublisherUploadTransaction * self;
-	PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	PublishingTumblrTumblrPublisherSession* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	PublishingTumblrTumblrPublisherSession* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	PublishingTumblrTumblrPublisherSession* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
 	gchar* payload = NULL;
 	gsize payload_length = 0UL;
-	PublishingTumblrTumblrPublisherSession* _tmp34_ = NULL;
+	PublishingTumblrTumblrPublisherSession* _tmp33_;
 	gchar* authorization_header = NULL;
-	gchar* _tmp35_ = NULL;
-	const gchar* _tmp36_ = NULL;
-	const gchar* _tmp37_ = NULL;
+	gchar* _tmp34_;
+	const gchar* _tmp35_;
+	const gchar* _tmp36_;
 	PublishingRESTSupportArgument** request_arguments = NULL;
-	gint _tmp38_ = 0;
-	PublishingRESTSupportArgument** _tmp39_ = NULL;
-	gint request_arguments_length1 = 0;
-	gint _request_arguments_size_ = 0;
-	PublishingRESTSupportArgument** _tmp40_ = NULL;
-	gint _tmp40__length1 = 0;
+	gint _tmp37_;
+	PublishingRESTSupportArgument** _tmp38_;
+	gint request_arguments_length1;
+	gint _request_arguments_size_;
+	PublishingRESTSupportArgument** _tmp39_;
+	gint _tmp39__length1;
 	gchar* request_data = NULL;
-	gchar* _tmp41_ = NULL;
+	gchar* _tmp40_;
 	SoupMessage* outbound_message = NULL;
-	gchar* _tmp64_ = NULL;
-	gchar* _tmp65_ = NULL;
-	SoupMessage* _tmp66_ = NULL;
-	SoupMessage* _tmp67_ = NULL;
-	SoupMessage* _tmp68_ = NULL;
-	const gchar* _tmp69_ = NULL;
-	guint8* _tmp70_ = NULL;
-	gint _tmp70__length1 = 0;
-	guint8* _tmp71_ = NULL;
-	gint _tmp71__length1 = 0;
+	gchar* _tmp63_;
+	gchar* _tmp64_;
+	SoupMessage* _tmp65_;
+	SoupMessage* _tmp66_;
+	SoupMessage* _tmp67_;
+	const gchar* _tmp68_;
+	guint8* _tmp69_;
+	gint _tmp69__length1;
+	guint8* _tmp70_;
+	gint _tmp70__length1;
 	GeeMapIterator* i = NULL;
-	GeeHashMap* _tmp72_ = NULL;
-	GeeMapIterator* _tmp73_ = NULL;
+	GeeHashMap* _tmp71_;
+	GeeMapIterator* _tmp72_;
 	gboolean cont = FALSE;
-	GeeMapIterator* _tmp74_ = NULL;
-	gboolean _tmp75_ = FALSE;
-	SoupMessage* _tmp87_ = NULL;
+	GeeMapIterator* _tmp73_;
+	gboolean _tmp74_;
+	SoupMessage* _tmp86_;
 	GError * _inner_error_ = NULL;
 #line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction);
@@ -6633,37 +6646,37 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_token", _tmp8_);
 #line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (_tmp8_);
-#line 6619 "TumblrPublishing.c"
+#line 6632 "TumblrPublishing.c"
 	{
-		SpitPublishingPublishable* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
-		GFile* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
+		SpitPublishingPublishable* _tmp9_;
+		GFile* _tmp10_;
+		GFile* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
 		gchar* _tmp14_ = NULL;
 		gsize _tmp15_ = 0UL;
 		gchar* reqdata = NULL;
-		const gchar* _tmp16_ = NULL;
-		guint8* _tmp17_ = NULL;
-		gint _tmp17__length1 = 0;
-		guint8* _tmp18_ = NULL;
-		gint _tmp18__length1 = 0;
-		gsize _tmp19_ = 0UL;
-		gchar* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
+		const gchar* _tmp16_;
+		guint8* _tmp17_;
+		gint _tmp17__length1;
+		guint8* _tmp18_;
+		gint _tmp18__length1;
+		gsize _tmp19_;
+		gchar* _tmp20_;
+		const gchar* _tmp21_;
 		gchar** keywords = NULL;
-		SpitPublishingPublishable* _tmp22_ = NULL;
-		gint _tmp23_ = 0;
-		gchar** _tmp24_ = NULL;
-		gint keywords_length1 = 0;
-		gint _keywords_size_ = 0;
+		SpitPublishingPublishable* _tmp22_;
+		gint _tmp23_;
+		gchar** _tmp24_;
+		gint keywords_length1;
+		gint _keywords_size_;
 		gchar* tags = NULL;
-		gchar* _tmp25_ = NULL;
-		gchar** _tmp26_ = NULL;
-		gint _tmp26__length1 = 0;
-		const gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		gchar* _tmp31_ = NULL;
+		gchar* _tmp25_;
+		gchar** _tmp26_;
+		gint _tmp26__length1;
+		const gchar* _tmp29_;
+		gchar* _tmp30_;
+		gchar* _tmp31_;
 #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->publishable;
 #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -6690,7 +6703,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 6676 "TumblrPublishing.c"
+#line 6689 "TumblrPublishing.c"
 				goto __catch38_g_file_error;
 			}
 #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -6701,7 +6714,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 			g_clear_error (&_inner_error_);
 #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 6687 "TumblrPublishing.c"
+#line 6700 "TumblrPublishing.c"
 		}
 #line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp16_ = payload;
@@ -6743,10 +6756,10 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 		_tmp26__length1 = keywords_length1;
 #line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		if (_tmp26_ != NULL) {
-#line 6729 "TumblrPublishing.c"
-			gchar** _tmp27_ = NULL;
-			gint _tmp27__length1 = 0;
-			gchar* _tmp28_ = NULL;
+#line 6742 "TumblrPublishing.c"
+			gchar** _tmp27_;
+			gint _tmp27__length1;
+			gchar* _tmp28_;
 #line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_tmp27_ = keywords;
 #line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -6757,7 +6770,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 			_g_free0 (tags);
 #line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			tags = _tmp28_;
-#line 6743 "TumblrPublishing.c"
+#line 6756 "TumblrPublishing.c"
 		}
 #line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp29_ = tags;
@@ -6775,27 +6788,24 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 		keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (reqdata);
-#line 6761 "TumblrPublishing.c"
+#line 6774 "TumblrPublishing.c"
 	}
 	goto __finally38;
 	__catch38_g_file_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp32_ = NULL;
-		GError* _tmp33_ = NULL;
+		GError* _tmp32_;
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		e = _inner_error_;
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_inner_error_ = NULL;
 #line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp32_ = _ ("A temporary file needed for publishing is unavailable");
-#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp33_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp32_);
+		_tmp32_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A temporary file needed for publishing is unavailable"));
 #line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_inner_error_ = _tmp33_;
+		_inner_error_ = _tmp32_;
 #line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_error_free0 (e);
-#line 6781 "TumblrPublishing.c"
+#line 6791 "TumblrPublishing.c"
 		goto __finally38;
 	}
 	__finally38:
@@ -6809,7 +6819,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 			_g_free0 (payload);
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 6795 "TumblrPublishing.c"
+#line 6805 "TumblrPublishing.c"
 		} else {
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_free0 (payload);
@@ -6819,259 +6829,259 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 			g_clear_error (&_inner_error_);
 #line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 6805 "TumblrPublishing.c"
+#line 6815 "TumblrPublishing.c"
 		}
 	}
 #line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp34_ = self->priv->session;
+	_tmp33_ = self->priv->session;
 #line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_session_sign_transaction (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+	publishing_tumblr_tumblr_publisher_session_sign_transaction (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
 #line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp35_ = publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_string (self);
+	_tmp34_ = publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_string (self);
 #line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	authorization_header = _tmp35_;
+	authorization_header = _tmp34_;
 #line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp36_ = authorization_header;
+	_tmp35_ = authorization_header;
 #line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_debug ("TumblrPublishing.vala:968: executing upload transaction: authorization" \
-" header string = '%s'", _tmp36_);
+" header string = '%s'", _tmp35_);
 #line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp37_ = authorization_header;
+	_tmp36_ = authorization_header;
 #line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp37_);
+	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp36_);
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp39_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp38_);
+	_tmp38_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp37_);
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	request_arguments = _tmp39_;
+	request_arguments = _tmp38_;
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	request_arguments_length1 = _tmp38_;
+	request_arguments_length1 = _tmp37_;
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_request_arguments_size_ = request_arguments_length1;
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp40_ = request_arguments;
+	_tmp39_ = request_arguments;
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp40__length1 = request_arguments_length1;
+	_tmp39__length1 = request_arguments_length1;
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_vala_assert (_tmp40__length1 > 0, "request_arguments.length > 0");
+	_vala_assert (_tmp39__length1 > 0, "request_arguments.length > 0");
 #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp41_ = g_strdup ("");
+	_tmp40_ = g_strdup ("");
 #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	request_data = _tmp41_;
-#line 6842 "TumblrPublishing.c"
+	request_data = _tmp40_;
+#line 6852 "TumblrPublishing.c"
 	{
 		gint i = 0;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		i = 0;
-#line 6847 "TumblrPublishing.c"
+#line 6857 "TumblrPublishing.c"
 		{
-			gboolean _tmp42_ = FALSE;
+			gboolean _tmp41_ = FALSE;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			_tmp42_ = TRUE;
+			_tmp41_ = TRUE;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			while (TRUE) {
-#line 6854 "TumblrPublishing.c"
-				gint _tmp44_ = 0;
-				PublishingRESTSupportArgument** _tmp45_ = NULL;
-				gint _tmp45__length1 = 0;
-				const gchar* _tmp46_ = NULL;
-				PublishingRESTSupportArgument** _tmp47_ = NULL;
-				gint _tmp47__length1 = 0;
-				gint _tmp48_ = 0;
-				PublishingRESTSupportArgument* _tmp49_ = NULL;
-				const gchar* _tmp50_ = NULL;
-				gchar* _tmp51_ = NULL;
-				gchar* _tmp52_ = NULL;
-				PublishingRESTSupportArgument** _tmp53_ = NULL;
-				gint _tmp53__length1 = 0;
-				gint _tmp54_ = 0;
-				PublishingRESTSupportArgument* _tmp55_ = NULL;
-				const gchar* _tmp56_ = NULL;
-				gchar* _tmp57_ = NULL;
-				gchar* _tmp58_ = NULL;
-				gchar* _tmp59_ = NULL;
-				gint _tmp60_ = 0;
-				PublishingRESTSupportArgument** _tmp61_ = NULL;
-				gint _tmp61__length1 = 0;
+#line 6864 "TumblrPublishing.c"
+				gint _tmp43_;
+				PublishingRESTSupportArgument** _tmp44_;
+				gint _tmp44__length1;
+				const gchar* _tmp45_;
+				PublishingRESTSupportArgument** _tmp46_;
+				gint _tmp46__length1;
+				gint _tmp47_;
+				PublishingRESTSupportArgument* _tmp48_;
+				const gchar* _tmp49_;
+				gchar* _tmp50_;
+				gchar* _tmp51_;
+				PublishingRESTSupportArgument** _tmp52_;
+				gint _tmp52__length1;
+				gint _tmp53_;
+				PublishingRESTSupportArgument* _tmp54_;
+				const gchar* _tmp55_;
+				gchar* _tmp56_;
+				gchar* _tmp57_;
+				gchar* _tmp58_;
+				gint _tmp59_;
+				PublishingRESTSupportArgument** _tmp60_;
+				gint _tmp60__length1;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (!_tmp42_) {
-#line 6879 "TumblrPublishing.c"
-					gint _tmp43_ = 0;
+				if (!_tmp41_) {
+#line 6889 "TumblrPublishing.c"
+					gint _tmp42_;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp43_ = i;
+					_tmp42_ = i;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					i = _tmp43_ + 1;
-#line 6885 "TumblrPublishing.c"
+					i = _tmp42_ + 1;
+#line 6895 "TumblrPublishing.c"
 				}
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp42_ = FALSE;
+				_tmp41_ = FALSE;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp44_ = i;
+				_tmp43_ = i;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp45_ = request_arguments;
+				_tmp44_ = request_arguments;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp45__length1 = request_arguments_length1;
+				_tmp44__length1 = request_arguments_length1;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (!(_tmp44_ < _tmp45__length1)) {
+				if (!(_tmp43_ < _tmp44__length1)) {
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					break;
-#line 6899 "TumblrPublishing.c"
+#line 6909 "TumblrPublishing.c"
 				}
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp46_ = request_data;
+				_tmp45_ = request_data;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp47_ = request_arguments;
+				_tmp46_ = request_arguments;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp47__length1 = request_arguments_length1;
+				_tmp46__length1 = request_arguments_length1;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp48_ = i;
+				_tmp47_ = i;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp49_ = _tmp47_[_tmp48_];
+				_tmp48_ = _tmp46_[_tmp47_];
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp50_ = _tmp49_->key;
+				_tmp49_ = _tmp48_->key;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp51_ = g_strconcat (_tmp50_, "=", NULL);
+				_tmp50_ = g_strconcat (_tmp49_, "=", NULL);
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp52_ = _tmp51_;
+				_tmp51_ = _tmp50_;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp53_ = request_arguments;
+				_tmp52_ = request_arguments;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp53__length1 = request_arguments_length1;
+				_tmp52__length1 = request_arguments_length1;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp54_ = i;
+				_tmp53_ = i;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp55_ = _tmp53_[_tmp54_];
+				_tmp54_ = _tmp52_[_tmp53_];
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp56_ = _tmp55_->value;
+				_tmp55_ = _tmp54_->value;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp57_ = g_strconcat (_tmp52_, _tmp56_, NULL);
+				_tmp56_ = g_strconcat (_tmp51_, _tmp55_, NULL);
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp58_ = _tmp57_;
+				_tmp57_ = _tmp56_;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp59_ = g_strconcat (_tmp46_, _tmp58_, NULL);
+				_tmp58_ = g_strconcat (_tmp45_, _tmp57_, NULL);
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_g_free0 (request_data);
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				request_data = _tmp59_;
+				request_data = _tmp58_;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp58_);
+				_g_free0 (_tmp57_);
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp52_);
+				_g_free0 (_tmp51_);
 #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp60_ = i;
+				_tmp59_ = i;
 #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp61_ = request_arguments;
+				_tmp60_ = request_arguments;
 #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp61__length1 = request_arguments_length1;
+				_tmp60__length1 = request_arguments_length1;
 #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (_tmp60_ < (_tmp61__length1 - 1)) {
-#line 6949 "TumblrPublishing.c"
-					const gchar* _tmp62_ = NULL;
-					gchar* _tmp63_ = NULL;
+				if (_tmp59_ < (_tmp60__length1 - 1)) {
+#line 6959 "TumblrPublishing.c"
+					const gchar* _tmp61_;
+					gchar* _tmp62_;
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp62_ = request_data;
+					_tmp61_ = request_data;
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp63_ = g_strconcat (_tmp62_, "&", NULL);
+					_tmp62_ = g_strconcat (_tmp61_, "&", NULL);
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_g_free0 (request_data);
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					request_data = _tmp63_;
-#line 6960 "TumblrPublishing.c"
+					request_data = _tmp62_;
+#line 6970 "TumblrPublishing.c"
 				}
 			}
 		}
 	}
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp64_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+	_tmp63_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp65_ = _tmp64_;
+	_tmp64_ = _tmp63_;
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp66_ = soup_message_new ("POST", _tmp65_);
+	_tmp65_ = soup_message_new ("POST", _tmp64_);
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp67_ = _tmp66_;
+	_tmp66_ = _tmp65_;
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp65_);
+	_g_free0 (_tmp64_);
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	outbound_message = _tmp67_;
+	outbound_message = _tmp66_;
 #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp68_ = outbound_message;
+	_tmp67_ = outbound_message;
 #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp69_ = request_data;
+	_tmp68_ = request_data;
 #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp70_ = string_get_data (_tmp69_, &_tmp70__length1);
+	_tmp69_ = string_get_data (_tmp68_, &_tmp69__length1);
 #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp71_ = _tmp70_;
+	_tmp70_ = _tmp69_;
 #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp71__length1 = _tmp70__length1;
+	_tmp70__length1 = _tmp69__length1;
 #line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	soup_message_set_request (_tmp68_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp71_, (gsize) _tmp71__length1);
+	soup_message_set_request (_tmp67_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp70_, (gsize) _tmp70__length1);
 #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp72_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->message_headers;
+	_tmp71_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->message_headers;
 #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp73_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+	_tmp72_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	i = _tmp73_;
+	i = _tmp72_;
 #line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp74_ = i;
+	_tmp73_ = i;
 #line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp75_ = gee_map_iterator_next (_tmp74_);
+	_tmp74_ = gee_map_iterator_next (_tmp73_);
 #line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	cont = _tmp75_;
+	cont = _tmp74_;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	while (TRUE) {
-#line 7003 "TumblrPublishing.c"
-		gboolean _tmp76_ = FALSE;
-		SoupMessage* _tmp77_ = NULL;
-		SoupMessageHeaders* _tmp78_ = NULL;
-		GeeMapIterator* _tmp79_ = NULL;
-		gpointer _tmp80_ = NULL;
-		gchar* _tmp81_ = NULL;
-		GeeMapIterator* _tmp82_ = NULL;
-		gpointer _tmp83_ = NULL;
-		gchar* _tmp84_ = NULL;
-		GeeMapIterator* _tmp85_ = NULL;
-		gboolean _tmp86_ = FALSE;
+#line 7013 "TumblrPublishing.c"
+		gboolean _tmp75_;
+		SoupMessage* _tmp76_;
+		SoupMessageHeaders* _tmp77_;
+		GeeMapIterator* _tmp78_;
+		gpointer _tmp79_;
+		gchar* _tmp80_;
+		GeeMapIterator* _tmp81_;
+		gpointer _tmp82_;
+		gchar* _tmp83_;
+		GeeMapIterator* _tmp84_;
+		gboolean _tmp85_;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp76_ = cont;
+		_tmp75_ = cont;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		if (!_tmp76_) {
+		if (!_tmp75_) {
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			break;
-#line 7021 "TumblrPublishing.c"
+#line 7031 "TumblrPublishing.c"
 		}
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp77_ = outbound_message;
+		_tmp76_ = outbound_message;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp78_ = _tmp77_->request_headers;
+		_tmp77_ = _tmp76_->request_headers;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp79_ = i;
+		_tmp78_ = i;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp80_ = gee_map_iterator_get_key (_tmp79_);
+		_tmp79_ = gee_map_iterator_get_key (_tmp78_);
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp81_ = (gchar*) _tmp80_;
+		_tmp80_ = (gchar*) _tmp79_;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp82_ = i;
+		_tmp81_ = i;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp83_ = gee_map_iterator_get_value (_tmp82_);
+		_tmp82_ = gee_map_iterator_get_value (_tmp81_);
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp84_ = (gchar*) _tmp83_;
+		_tmp83_ = (gchar*) _tmp82_;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		soup_message_headers_append (_tmp78_, _tmp81_, _tmp84_);
+		soup_message_headers_append (_tmp77_, _tmp80_, _tmp83_);
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp84_);
+		_g_free0 (_tmp83_);
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp81_);
+		_g_free0 (_tmp80_);
 #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp85_ = i;
+		_tmp84_ = i;
 #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp86_ = gee_map_iterator_next (_tmp85_);
+		_tmp85_ = gee_map_iterator_next (_tmp84_);
 #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		cont = _tmp86_;
-#line 7051 "TumblrPublishing.c"
+		cont = _tmp85_;
+#line 7061 "TumblrPublishing.c"
 	}
 #line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp87_ = outbound_message;
+	_tmp86_ = outbound_message;
 #line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp87_);
+	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp86_);
 #line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
 #line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -7096,7 +7106,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 			_g_free0 (payload);
 #line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 7081 "TumblrPublishing.c"
+#line 7091 "TumblrPublishing.c"
 		} else {
 #line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_object_unref0 (i);
@@ -7116,7 +7126,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 			g_clear_error (&_inner_error_);
 #line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 7101 "TumblrPublishing.c"
+#line 7111 "TumblrPublishing.c"
 		}
 	}
 #line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -7131,7 +7141,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 	_g_free0 (authorization_header);
 #line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (payload);
-#line 7116 "TumblrPublishing.c"
+#line 7126 "TumblrPublishing.c"
 }
 
 
@@ -7143,19 +7153,19 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_class_init (Pu
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherUploadTransactionPrivate));
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_tumblr_tumblr_publisher_upload_transaction_real_execute;
-#line 7129 "TumblrPublishing.c"
+	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_tumblr_tumblr_publisher_upload_transaction_real_execute;
+#line 7139 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_upload_transaction_instance_init (PublishingTumblrTumblrPublisherUploadTransaction * self) {
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 7136 "TumblrPublishing.c"
+#line 7146 "TumblrPublishing.c"
 }
 
 
-static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) {
+static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
 	PublishingTumblrTumblrPublisherUploadTransaction * self;
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction);
@@ -7165,7 +7175,7 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (Publ
 	self->priv->auth_header_fields = (_vala_array_free (self->priv->auth_header_fields, self->priv->auth_header_fields_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_tumblr_tumblr_publisher_upload_transaction_parent_class)->finalize (obj);
-#line 7150 "TumblrPublishing.c"
+#line 7160 "TumblrPublishing.c"
 }
 
 
@@ -7183,11 +7193,11 @@ GType publishing_tumblr_tumblr_publisher_upload_transaction_get_type (void) {
 
 PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url) {
 	PublishingTumblrTumblrPublisherUploader* self = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL;
-	SpitPublishingPublishable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	PublishingTumblrTumblrPublisherSession* _tmp0_;
+	SpitPublishingPublishable** _tmp1_;
+	gint _tmp1__length1;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
 #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -7210,27 +7220,27 @@ PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uplo
 	self->priv->blog_url = _tmp3_;
 #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 7195 "TumblrPublishing.c"
+#line 7205 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_new (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url) {
 #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_uploader_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, session, publishables, publishables_length1, blog_url);
-#line 7202 "TumblrPublishing.c"
+#line 7212 "TumblrPublishing.c"
 }
 
 
 static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
 	PublishingTumblrTumblrPublisherUploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp1_ = NULL;
-	SpitPublishingPublishable* _tmp2_ = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	PublishingTumblrTumblrPublisherUploadTransaction* _tmp5_ = NULL;
-	PublishingRESTSupportTransaction* _tmp6_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingTumblrTumblrPublisherSession* _tmp1_;
+	SpitPublishingPublishable* _tmp2_;
+	SpitPublishingPublishable* _tmp3_;
+	const gchar* _tmp4_;
+	PublishingTumblrTumblrPublisherUploadTransaction* _tmp5_;
+	PublishingRESTSupportTransaction* _tmp6_;
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader);
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -7259,7 +7269,7 @@ static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uplo
 	result = _tmp6_;
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 7244 "TumblrPublishing.c"
+#line 7254 "TumblrPublishing.c"
 }
 
 
@@ -7271,24 +7281,24 @@ static void publishing_tumblr_tumblr_publisher_uploader_class_init (PublishingTu
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherUploaderPrivate));
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_tumblr_tumblr_publisher_uploader_real_create_transaction;
-#line 7257 "TumblrPublishing.c"
+	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_tumblr_tumblr_publisher_uploader_real_create_transaction;
+#line 7267 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_uploader_instance_init (PublishingTumblrTumblrPublisherUploader * self) {
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE (self);
 #line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = g_strdup ("");
 #line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->blog_url = _tmp0_;
-#line 7269 "TumblrPublishing.c"
+#line 7279 "TumblrPublishing.c"
 }
 
 
-static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
+static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
 	PublishingTumblrTumblrPublisherUploader * self;
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader);
@@ -7296,7 +7306,7 @@ static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingREST
 	_g_free0 (self->priv->blog_url);
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_tumblr_tumblr_publisher_uploader_parent_class)->finalize (obj);
-#line 7281 "TumblrPublishing.c"
+#line 7291 "TumblrPublishing.c"
 }
 
 
@@ -7318,14 +7328,14 @@ PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_sessi
 	self = (PublishingTumblrTumblrPublisherSession*) publishing_rest_support_session_construct (object_type, PUBLISHING_TUMBLR_ENDPOINT_URL);
 #line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 7303 "TumblrPublishing.c"
+#line 7313 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_new (void) {
 #line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_session_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION);
-#line 7310 "TumblrPublishing.c"
+#line 7320 "TumblrPublishing.c"
 }
 
 
@@ -7333,38 +7343,38 @@ static gboolean publishing_tumblr_tumblr_publisher_session_real_is_authenticated
 	PublishingTumblrTumblrPublisherSession * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp1_;
 #line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession);
 #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = self->priv->access_phase_token;
 #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp1_ != NULL) {
-#line 7325 "TumblrPublishing.c"
-		const gchar* _tmp2_ = NULL;
+#line 7335 "TumblrPublishing.c"
+		const gchar* _tmp2_;
 #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp2_ = self->priv->access_phase_token_secret;
 #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 7331 "TumblrPublishing.c"
+#line 7341 "TumblrPublishing.c"
 	} else {
 #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = FALSE;
-#line 7335 "TumblrPublishing.c"
+#line 7345 "TumblrPublishing.c"
 	}
 #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = _tmp0_;
 #line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 7341 "TumblrPublishing.c"
+#line 7351 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_tumblr_publisher_session_authenticate_from_persistent_credentials (PublishingTumblrTumblrPublisherSession* self, const gchar* token, const gchar* secret) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self));
 #line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -7389,7 +7399,7 @@ void publishing_tumblr_tumblr_publisher_session_authenticate_from_persistent_cre
 	self->priv->access_phase_token_secret = _tmp3_;
 #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 7374 "TumblrPublishing.c"
+#line 7384 "TumblrPublishing.c"
 }
 
 
@@ -7404,92 +7414,92 @@ void publishing_tumblr_tumblr_publisher_session_deauthenticate (PublishingTumblr
 	_g_free0 (self->priv->access_phase_token_secret);
 #line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->access_phase_token_secret = NULL;
-#line 7389 "TumblrPublishing.c"
+#line 7399 "TumblrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 7396 "TumblrPublishing.c"
+#line 7406 "TumblrPublishing.c"
 }
 
 
-static void _vala_array_add23 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
+static void _vala_array_add23 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if ((*length) == (*size)) {
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 7407 "TumblrPublishing.c"
+#line 7417 "TumblrPublishing.c"
 	}
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7413 "TumblrPublishing.c"
+#line 7423 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumblrTumblrPublisherSession* self, PublishingRESTSupportTransaction* txn) {
 	gchar* http_method = NULL;
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	PublishingRESTSupportHttpMethod _tmp1_;
+	gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
 	gchar* signing_key = NULL;
-	const gchar* _tmp6_ = NULL;
+	const gchar* _tmp6_;
 	PublishingRESTSupportArgument** base_string_arguments = NULL;
-	PublishingRESTSupportTransaction* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	PublishingRESTSupportArgument** _tmp13_ = NULL;
-	gint base_string_arguments_length1 = 0;
-	gint _base_string_arguments_size_ = 0;
+	PublishingRESTSupportTransaction* _tmp11_;
+	gint _tmp12_;
+	PublishingRESTSupportArgument** _tmp13_;
+	gint base_string_arguments_length1;
+	gint _base_string_arguments_size_;
 	PublishingTumblrTumblrPublisherUploadTransaction* upload_txn = NULL;
-	PublishingRESTSupportTransaction* _tmp14_ = NULL;
-	PublishingTumblrTumblrPublisherUploadTransaction* _tmp15_ = NULL;
-	PublishingTumblrTumblrPublisherUploadTransaction* _tmp16_ = NULL;
+	PublishingRESTSupportTransaction* _tmp14_;
+	PublishingTumblrTumblrPublisherUploadTransaction* _tmp15_;
+	PublishingTumblrTumblrPublisherUploadTransaction* _tmp16_;
 	PublishingRESTSupportArgument** sorted_args = NULL;
-	PublishingRESTSupportArgument** _tmp25_ = NULL;
-	gint _tmp25__length1 = 0;
-	gint _tmp26_ = 0;
-	PublishingRESTSupportArgument** _tmp27_ = NULL;
-	gint sorted_args_length1 = 0;
-	gint _sorted_args_size_ = 0;
+	PublishingRESTSupportArgument** _tmp25_;
+	gint _tmp25__length1;
+	gint _tmp26_;
+	PublishingRESTSupportArgument** _tmp27_;
+	gint sorted_args_length1;
+	gint _sorted_args_size_;
 	gchar* arguments_string = NULL;
-	gchar* _tmp28_ = NULL;
+	gchar* _tmp28_;
 	gchar* signature_base_string = NULL;
-	const gchar* _tmp51_ = NULL;
-	gchar* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
-	PublishingRESTSupportTransaction* _tmp54_ = NULL;
-	gchar* _tmp55_ = NULL;
-	gchar* _tmp56_ = NULL;
-	gchar* _tmp57_ = NULL;
-	gchar* _tmp58_ = NULL;
-	gchar* _tmp59_ = NULL;
-	gchar* _tmp60_ = NULL;
-	gchar* _tmp61_ = NULL;
-	gchar* _tmp62_ = NULL;
-	const gchar* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
-	gchar* _tmp65_ = NULL;
-	gchar* _tmp66_ = NULL;
-	gchar* _tmp67_ = NULL;
-	const gchar* _tmp68_ = NULL;
-	const gchar* _tmp69_ = NULL;
+	const gchar* _tmp51_;
+	gchar* _tmp52_;
+	gchar* _tmp53_;
+	PublishingRESTSupportTransaction* _tmp54_;
+	gchar* _tmp55_;
+	gchar* _tmp56_;
+	gchar* _tmp57_;
+	gchar* _tmp58_;
+	gchar* _tmp59_;
+	gchar* _tmp60_;
+	gchar* _tmp61_;
+	gchar* _tmp62_;
+	const gchar* _tmp63_;
+	gchar* _tmp64_;
+	gchar* _tmp65_;
+	gchar* _tmp66_;
+	gchar* _tmp67_;
+	const gchar* _tmp68_;
+	const gchar* _tmp69_;
 	gchar* signature = NULL;
-	const gchar* _tmp70_ = NULL;
-	const gchar* _tmp71_ = NULL;
-	gchar* _tmp72_ = NULL;
-	const gchar* _tmp73_ = NULL;
-	const gchar* _tmp74_ = NULL;
-	gchar* _tmp75_ = NULL;
-	const gchar* _tmp76_ = NULL;
-	PublishingTumblrTumblrPublisherUploadTransaction* _tmp77_ = NULL;
+	const gchar* _tmp70_;
+	const gchar* _tmp71_;
+	gchar* _tmp72_;
+	const gchar* _tmp73_;
+	const gchar* _tmp74_;
+	gchar* _tmp75_;
+	const gchar* _tmp76_;
+	PublishingTumblrTumblrPublisherUploadTransaction* _tmp77_;
 #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self));
 #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -7520,10 +7530,10 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 	_tmp6_ = self->priv->access_phase_token_secret;
 #line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp6_ != NULL) {
-#line 7505 "TumblrPublishing.c"
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+#line 7515 "TumblrPublishing.c"
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_debug ("TumblrPublishing.vala:1055: access phase token secret available; using" \
 " it as signing key");
@@ -7539,9 +7549,9 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 		signing_key = _tmp9_;
 #line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 7523 "TumblrPublishing.c"
+#line 7533 "TumblrPublishing.c"
 	} else {
-		gchar* _tmp10_ = NULL;
+		gchar* _tmp10_;
 #line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_debug ("TumblrPublishing.vala:1059: %s", "Access phase token secret not available; using API " "key as signing key");
 #line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -7550,7 +7560,7 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 		_g_free0 (signing_key);
 #line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		signing_key = _tmp10_;
-#line 7534 "TumblrPublishing.c"
+#line 7544 "TumblrPublishing.c"
 	}
 #line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp11_ = txn;
@@ -7572,15 +7582,15 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 	_tmp16_ = upload_txn;
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp16_ != NULL) {
-#line 7556 "TumblrPublishing.c"
+#line 7566 "TumblrPublishing.c"
 		PublishingRESTSupportArgument** auth_header_args = NULL;
-		PublishingTumblrTumblrPublisherUploadTransaction* _tmp17_ = NULL;
-		gint _tmp18_ = 0;
-		PublishingRESTSupportArgument** _tmp19_ = NULL;
-		gint auth_header_args_length1 = 0;
-		gint _auth_header_args_size_ = 0;
-		PublishingRESTSupportArgument** _tmp20_ = NULL;
-		gint _tmp20__length1 = 0;
+		PublishingTumblrTumblrPublisherUploadTransaction* _tmp17_;
+		gint _tmp18_;
+		PublishingRESTSupportArgument** _tmp19_;
+		gint auth_header_args_length1;
+		gint _auth_header_args_size_;
+		PublishingRESTSupportArgument** _tmp20_;
+		gint _tmp20__length1;
 #line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_debug ("TumblrPublishing.vala:1070: %s", "this transaction is an UploadTransaction; including Authorization head" \
 "er " "fields in signature base string");
@@ -7598,7 +7608,7 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 		_tmp20_ = auth_header_args;
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp20__length1 = auth_header_args_length1;
-#line 7581 "TumblrPublishing.c"
+#line 7591 "TumblrPublishing.c"
 		{
 			PublishingRESTSupportArgument** arg_collection = NULL;
 			gint arg_collection_length1 = 0;
@@ -7610,19 +7620,19 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 			arg_collection_length1 = _tmp20__length1;
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			for (arg_it = 0; arg_it < _tmp20__length1; arg_it = arg_it + 1) {
-#line 7593 "TumblrPublishing.c"
-				PublishingRESTSupportArgument* _tmp21_ = NULL;
+#line 7603 "TumblrPublishing.c"
+				PublishingRESTSupportArgument* _tmp21_;
 				PublishingRESTSupportArgument* arg = NULL;
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp21_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				arg = _tmp21_;
-#line 7600 "TumblrPublishing.c"
+#line 7610 "TumblrPublishing.c"
 				{
-					PublishingRESTSupportArgument** _tmp22_ = NULL;
-					gint _tmp22__length1 = 0;
-					PublishingRESTSupportArgument* _tmp23_ = NULL;
-					PublishingRESTSupportArgument* _tmp24_ = NULL;
+					PublishingRESTSupportArgument** _tmp22_;
+					gint _tmp22__length1;
+					PublishingRESTSupportArgument* _tmp23_;
+					PublishingRESTSupportArgument* _tmp24_;
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp22_ = base_string_arguments;
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -7635,13 +7645,13 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 					_vala_array_add23 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp24_);
 #line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_publishing_rest_support_argument_unref0 (arg);
-#line 7618 "TumblrPublishing.c"
+#line 7628 "TumblrPublishing.c"
 				}
 			}
 		}
 #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		auth_header_args = (_vala_array_free (auth_header_args, auth_header_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 7624 "TumblrPublishing.c"
+#line 7634 "TumblrPublishing.c"
 	}
 #line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp25_ = base_string_arguments;
@@ -7659,50 +7669,50 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 	_tmp28_ = g_strdup ("");
 #line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	arguments_string = _tmp28_;
-#line 7642 "TumblrPublishing.c"
+#line 7652 "TumblrPublishing.c"
 	{
 		gint i = 0;
 #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		i = 0;
-#line 7647 "TumblrPublishing.c"
+#line 7657 "TumblrPublishing.c"
 		{
 			gboolean _tmp29_ = FALSE;
 #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_tmp29_ = TRUE;
 #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			while (TRUE) {
-#line 7654 "TumblrPublishing.c"
-				gint _tmp31_ = 0;
-				PublishingRESTSupportArgument** _tmp32_ = NULL;
-				gint _tmp32__length1 = 0;
-				const gchar* _tmp33_ = NULL;
-				PublishingRESTSupportArgument** _tmp34_ = NULL;
-				gint _tmp34__length1 = 0;
-				gint _tmp35_ = 0;
-				PublishingRESTSupportArgument* _tmp36_ = NULL;
-				const gchar* _tmp37_ = NULL;
-				gchar* _tmp38_ = NULL;
-				gchar* _tmp39_ = NULL;
-				PublishingRESTSupportArgument** _tmp40_ = NULL;
-				gint _tmp40__length1 = 0;
-				gint _tmp41_ = 0;
-				PublishingRESTSupportArgument* _tmp42_ = NULL;
-				const gchar* _tmp43_ = NULL;
-				gchar* _tmp44_ = NULL;
-				gchar* _tmp45_ = NULL;
-				gchar* _tmp46_ = NULL;
-				gint _tmp47_ = 0;
-				PublishingRESTSupportArgument** _tmp48_ = NULL;
-				gint _tmp48__length1 = 0;
+#line 7664 "TumblrPublishing.c"
+				gint _tmp31_;
+				PublishingRESTSupportArgument** _tmp32_;
+				gint _tmp32__length1;
+				const gchar* _tmp33_;
+				PublishingRESTSupportArgument** _tmp34_;
+				gint _tmp34__length1;
+				gint _tmp35_;
+				PublishingRESTSupportArgument* _tmp36_;
+				const gchar* _tmp37_;
+				gchar* _tmp38_;
+				gchar* _tmp39_;
+				PublishingRESTSupportArgument** _tmp40_;
+				gint _tmp40__length1;
+				gint _tmp41_;
+				PublishingRESTSupportArgument* _tmp42_;
+				const gchar* _tmp43_;
+				gchar* _tmp44_;
+				gchar* _tmp45_;
+				gchar* _tmp46_;
+				gint _tmp47_;
+				PublishingRESTSupportArgument** _tmp48_;
+				gint _tmp48__length1;
 #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (!_tmp29_) {
-#line 7679 "TumblrPublishing.c"
-					gint _tmp30_ = 0;
+#line 7689 "TumblrPublishing.c"
+					gint _tmp30_;
 #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp30_ = i;
 #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					i = _tmp30_ + 1;
-#line 7685 "TumblrPublishing.c"
+#line 7695 "TumblrPublishing.c"
 				}
 #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp29_ = FALSE;
@@ -7716,7 +7726,7 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 				if (!(_tmp31_ < _tmp32__length1)) {
 #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					break;
-#line 7699 "TumblrPublishing.c"
+#line 7709 "TumblrPublishing.c"
 				}
 #line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp33_ = arguments_string;
@@ -7766,9 +7776,9 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 				_tmp48__length1 = sorted_args_length1;
 #line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (_tmp47_ < (_tmp48__length1 - 1)) {
-#line 7749 "TumblrPublishing.c"
-					const gchar* _tmp49_ = NULL;
-					gchar* _tmp50_ = NULL;
+#line 7759 "TumblrPublishing.c"
+					const gchar* _tmp49_;
+					gchar* _tmp50_;
 #line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp49_ = arguments_string;
 #line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -7777,7 +7787,7 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 					_g_free0 (arguments_string);
 #line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					arguments_string = _tmp50_;
-#line 7760 "TumblrPublishing.c"
+#line 7770 "TumblrPublishing.c"
 				}
 			}
 		}
@@ -7866,26 +7876,26 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 	_tmp77_ = upload_txn;
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp77_ != NULL) {
-#line 7849 "TumblrPublishing.c"
-		PublishingTumblrTumblrPublisherUploadTransaction* _tmp78_ = NULL;
-		const gchar* _tmp79_ = NULL;
+#line 7859 "TumblrPublishing.c"
+		PublishingTumblrTumblrPublisherUploadTransaction* _tmp78_;
+		const gchar* _tmp79_;
 #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp78_ = upload_txn;
 #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp79_ = signature;
 #line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (_tmp78_, "oauth_signature", _tmp79_);
-#line 7858 "TumblrPublishing.c"
+#line 7868 "TumblrPublishing.c"
 	} else {
-		PublishingRESTSupportTransaction* _tmp80_ = NULL;
-		const gchar* _tmp81_ = NULL;
+		PublishingRESTSupportTransaction* _tmp80_;
+		const gchar* _tmp81_;
 #line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp80_ = txn;
 #line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp81_ = signature;
 #line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_rest_support_transaction_add_argument (_tmp80_, "oauth_signature", _tmp81_);
-#line 7868 "TumblrPublishing.c"
+#line 7878 "TumblrPublishing.c"
 	}
 #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (signature);
@@ -7903,15 +7913,15 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 	_g_free0 (signing_key);
 #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (http_method);
-#line 7886 "TumblrPublishing.c"
+#line 7896 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (PublishingTumblrTumblrPublisherSession* self, const gchar* token, const gchar* secret) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self));
 #line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -7936,14 +7946,14 @@ void publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (Pu
 	self->priv->access_phase_token_secret = _tmp3_;
 #line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 7919 "TumblrPublishing.c"
+#line 7929 "TumblrPublishing.c"
 }
 
 
 gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token (PublishingTumblrTumblrPublisherSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
 #line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -7954,14 +7964,14 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token (Publis
 	result = _tmp1_;
 #line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 7937 "TumblrPublishing.c"
+#line 7947 "TumblrPublishing.c"
 }
 
 
 gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret (PublishingTumblrTumblrPublisherSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
 #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -7972,25 +7982,25 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret
 	result = _tmp1_;
 #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 7955 "TumblrPublishing.c"
+#line 7965 "TumblrPublishing.c"
 }
 
 
 gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (PublishingTumblrTumblrPublisherSession* self) {
 	gchar* result = NULL;
 	GTimeVal currtime = {0};
-	GTimeVal _tmp0_ = {0};
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	GTimeVal _tmp4_ = {0};
-	glong _tmp5_ = 0L;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
+	GTimeVal _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	GTimeVal _tmp4_;
+	glong _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
 #line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
 #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -8031,50 +8041,50 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (PublishingTum
 	result = _tmp11_;
 #line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 8014 "TumblrPublishing.c"
+#line 8024 "TumblrPublishing.c"
 }
 
 
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 8037 "TumblrPublishing.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8047 "TumblrPublishing.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 8045 "TumblrPublishing.c"
+#line 8055 "TumblrPublishing.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 8057 "TumblrPublishing.c"
+#line 8067 "TumblrPublishing.c"
 	}
 }
 
@@ -8083,133 +8093,133 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 8081 "TumblrPublishing.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8091 "TumblrPublishing.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 8087 "TumblrPublishing.c"
+#line 8097 "TumblrPublishing.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 8091 "TumblrPublishing.c"
+#line 8101 "TumblrPublishing.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 8095 "TumblrPublishing.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8105 "TumblrPublishing.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 8107 "TumblrPublishing.c"
+#line 8117 "TumblrPublishing.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 8117 "TumblrPublishing.c"
+#line 8127 "TumblrPublishing.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 8123 "TumblrPublishing.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8133 "TumblrPublishing.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 8137 "TumblrPublishing.c"
+#line 8147 "TumblrPublishing.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 8147 "TumblrPublishing.c"
+#line 8157 "TumblrPublishing.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 8153 "TumblrPublishing.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 8163 "TumblrPublishing.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 8162 "TumblrPublishing.c"
+#line 8172 "TumblrPublishing.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 8182 "TumblrPublishing.c"
+#line 8192 "TumblrPublishing.c"
 }
 
 
 gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (PublishingTumblrTumblrPublisherSession* self) {
 	gchar* result = NULL;
-	gint64 _tmp0_ = 0LL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	gint64 _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
 #line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -8228,7 +8238,7 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (Publishin
 	result = _tmp4_;
 #line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 8211 "TumblrPublishing.c"
+#line 8221 "TumblrPublishing.c"
 }
 
 
@@ -8240,8 +8250,8 @@ static void publishing_tumblr_tumblr_publisher_session_class_init (PublishingTum
 #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherSessionPrivate));
 #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_tumblr_tumblr_publisher_session_real_is_authenticated;
-#line 8224 "TumblrPublishing.c"
+	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_tumblr_tumblr_publisher_session_real_is_authenticated;
+#line 8234 "TumblrPublishing.c"
 }
 
 
@@ -8252,11 +8262,11 @@ static void publishing_tumblr_tumblr_publisher_session_instance_init (Publishing
 	self->priv->access_phase_token = NULL;
 #line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->access_phase_token_secret = NULL;
-#line 8235 "TumblrPublishing.c"
+#line 8245 "TumblrPublishing.c"
 }
 
 
-static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTSupportSession* obj) {
+static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTSupportSession * obj) {
 	PublishingTumblrTumblrPublisherSession * self;
 #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession);
@@ -8266,7 +8276,7 @@ static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTS
 	_g_free0 (self->priv->access_phase_token_secret);
 #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_tumblr_tumblr_publisher_session_parent_class)->finalize (obj);
-#line 8249 "TumblrPublishing.c"
+#line 8259 "TumblrPublishing.c"
 }
 
 
@@ -8293,7 +8303,7 @@ static void publishing_tumblr_tumblr_publisher_class_init (PublishingTumblrTumbl
 	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherPrivate));
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_finalize;
-#line 8276 "TumblrPublishing.c"
+#line 8286 "TumblrPublishing.c"
 }
 
 
@@ -8301,23 +8311,27 @@ static void publishing_tumblr_tumblr_publisher_spit_publishing_publisher_interfa
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_tumblr_tumblr_publisher_real_get_service;
+	iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_get_service;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_tumblr_tumblr_publisher_real_is_running;
+	iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_is_running;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_tumblr_tumblr_publisher_real_start;
+	iface->start = (void (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_start;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_tumblr_tumblr_publisher_real_stop;
-#line 8291 "TumblrPublishing.c"
+	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_tumblr_tumblr_publisher_real_stop;
+#line 8301 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_instance_init (PublishingTumblrTumblrPublisher * self) {
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_GET_PRIVATE (self);
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->progress_reporter = NULL;
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self->priv->progress_reporter_target = self;
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->running = FALSE;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -8342,14 +8356,14 @@ static void publishing_tumblr_tumblr_publisher_instance_init (PublishingTumblrTu
 	_tmp0_ = g_strdup ("");
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->username = _tmp0_;
-#line 8325 "TumblrPublishing.c"
+#line 8339 "TumblrPublishing.c"
 }
 
 
-static void publishing_tumblr_tumblr_publisher_finalize (GObject* obj) {
+static void publishing_tumblr_tumblr_publisher_finalize (GObject * obj) {
 	PublishingTumblrTumblrPublisher * self;
-	PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	PublishingTumblrTumblrPublisherSession* _tmp0_;
+	guint _tmp1_;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TYPE_TUMBLR_PUBLISHER, PublishingTumblrTumblrPublisher);
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -8382,7 +8396,7 @@ static void publishing_tumblr_tumblr_publisher_finalize (GObject* obj) {
 	_g_free0 (self->priv->username);
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_parent_class)->finalize (obj);
-#line 8365 "TumblrPublishing.c"
+#line 8379 "TumblrPublishing.c"
 }