Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4' with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4
author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2017-11-12 15:55:20 +0100
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2017-11-12 15:55:20 +0100
commit: f6140ff1c9ec493d947da5b346508846e7a1a06f (patch)
tree: c01b9164ee4b0d46b6670ccee45f6181c6237d7f /plugins/shotwell-publishing-extras/YandexPublishing.c
parent: 0f67b3cc674377559e66c5a6729fd499049a992f (diff)
parent: 2492891f112caac6076ce49721d9d5d78a152c3a (diff)
1 files changed, 846 insertions, 839 deletions
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.c b/plugins/shotwell-publishing-extras/YandexPublishing.c
index 54894d6..492f100 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.c
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.c
@@ -1,4 +1,4 @@
-/* YandexPublishing.c generated by valac 0.34.7, the Vala compiler
+/* YandexPublishing.c generated by valac 0.36.6, the Vala compiler
  * generated from YandexPublishing.vala, do not modify */
 
 /* Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>
@@ -87,6 +87,12 @@ typedef struct _PublishingYandexWebAuthPanePrivate PublishingYandexWebAuthPanePr
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_match_info_unref0(var) ((var == NULL) ? NULL : (var = (g_match_info_unref (var), NULL)))
 #define __vala_WebKitNavigationAction_free0(var) ((var == NULL) ? NULL : (var = (_vala_WebKitNavigationAction_free (var), NULL)))
+enum  {
+	PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_SUCCEEDED_SIGNAL,
+	PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_FAILED_SIGNAL,
+	PUBLISHING_YANDEX_WEB_AUTH_PANE_LAST_SIGNAL
+};
+static guint publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LAST_SIGNAL] = {0};
 
 #define PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS (publishing_yandex_publish_options_get_type ())
 #define PUBLISHING_YANDEX_PUBLISH_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS, PublishingYandexPublishOptions))
@@ -110,6 +116,12 @@ typedef struct _PublishingYandexParamSpecPublishOptions PublishingYandexParamSpe
 typedef struct _PublishingYandexPublishingOptionsPane PublishingYandexPublishingOptionsPane;
 typedef struct _PublishingYandexPublishingOptionsPaneClass PublishingYandexPublishingOptionsPaneClass;
 typedef struct _PublishingYandexPublishingOptionsPanePrivate PublishingYandexPublishingOptionsPanePrivate;
+enum  {
+	PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL,
+	PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL,
+	PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL
+};
+static guint publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LAST_SIGNAL] = {0};
 
 #define PUBLISHING_YANDEX_TYPE_UPLOADER (publishing_yandex_uploader_get_type ())
 #define PUBLISHING_YANDEX_UPLOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader))
@@ -274,18 +286,18 @@ struct _PublishingYandexYandexPublisherPrivate {
 
 
 static gpointer yandex_service_parent_class = NULL;
-static SpitPluggableIface* yandex_service_spit_pluggable_parent_iface = NULL;
-static SpitPublishingServiceIface* yandex_service_spit_publishing_service_parent_iface = NULL;
+static SpitPluggableIface * yandex_service_spit_pluggable_parent_iface = NULL;
+static SpitPublishingServiceIface * yandex_service_spit_publishing_service_parent_iface = NULL;
 static gpointer publishing_yandex_transaction_parent_class = NULL;
 static gpointer publishing_yandex_session_parent_class = NULL;
 static gpointer publishing_yandex_web_auth_pane_parent_class = NULL;
 static gpointer publishing_yandex_publish_options_parent_class = NULL;
 static gpointer publishing_yandex_publishing_options_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_yandex_uploader_parent_class = NULL;
 static gpointer publishing_yandex_upload_transaction_parent_class = NULL;
 static gpointer publishing_yandex_yandex_publisher_parent_class = NULL;
-static SpitPublishingPublisherIface* publishing_yandex_yandex_publisher_spit_publishing_publisher_parent_iface = NULL;
+static SpitPublishingPublisherIface * publishing_yandex_yandex_publisher_spit_publishing_publisher_parent_iface = NULL;
 
 GType yandex_service_get_type (void) G_GNUC_CONST;
 enum  {
@@ -326,7 +338,7 @@ PublishingYandexSession* publishing_yandex_session_construct (GType object_type)
 static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTSupportSession* base);
 void publishing_yandex_session_deauthenticate (PublishingYandexSession* self);
 void publishing_yandex_session_set_auth_token (PublishingYandexSession* self, const gchar* token);
-static void publishing_yandex_session_finalize (PublishingRESTSupportSession* obj);
+static void publishing_yandex_session_finalize (PublishingRESTSupportSession * obj);
 GType publishing_yandex_web_auth_pane_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_YANDEX_WEB_AUTH_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPanePrivate))
 enum  {
@@ -340,7 +352,7 @@ static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_vie
 static void publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
 static WebKitNavigationAction* _vala_WebKitNavigationAction_copy (WebKitNavigationAction* self);
 static void _vala_WebKitNavigationAction_free (WebKitNavigationAction* self);
-static void publishing_yandex_web_auth_pane_finalize (GObject* obj);
+static void publishing_yandex_web_auth_pane_finalize (GObject * obj);
 gpointer publishing_yandex_publish_options_ref (gpointer instance);
 void publishing_yandex_publish_options_unref (gpointer instance);
 GParamSpec* publishing_yandex_param_spec_publish_options (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -353,7 +365,7 @@ enum  {
 };
 PublishingYandexPublishOptions* publishing_yandex_publish_options_new (void);
 PublishingYandexPublishOptions* publishing_yandex_publish_options_construct (GType object_type);
-static void publishing_yandex_publish_options_finalize (PublishingYandexPublishOptions* obj);
+static void publishing_yandex_publish_options_finalize (PublishingYandexPublishOptions * obj);
 GType publishing_yandex_publishing_options_pane_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPanePrivate))
 enum  {
@@ -369,7 +381,7 @@ static void publishing_yandex_publishing_options_pane_on_publish_clicked (Publis
 static void _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void publishing_yandex_publishing_options_pane_on_logout_clicked (PublishingYandexPublishingOptionsPane* self);
 static void _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void publishing_yandex_publishing_options_pane_finalize (GObject* obj);
+static void publishing_yandex_publishing_options_pane_finalize (GObject * obj);
 GType publishing_yandex_uploader_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_YANDEX_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploaderPrivate))
 enum  {
@@ -381,7 +393,7 @@ static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_
 PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo);
 PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construct (GType object_type, PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo);
 GType publishing_yandex_upload_transaction_get_type (void) G_GNUC_CONST;
-static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploader* obj);
+static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
 enum  {
 	PUBLISHING_YANDEX_UPLOAD_TRANSACTION_DUMMY_PROPERTY
 };
@@ -438,7 +450,7 @@ static void publishing_yandex_yandex_publisher_show_welcome_page (PublishingYand
 static void _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback (gpointer self);
 static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublisher* base);
 static void publishing_yandex_yandex_publisher_real_stop (SpitPublishingPublisher* base);
-static void publishing_yandex_yandex_publisher_finalize (GObject* obj);
+static void publishing_yandex_yandex_publisher_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
@@ -447,9 +459,9 @@ static gint _vala_array_length (gpointer array);
 static gint yandex_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
 	YandexService * self;
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 8 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService);
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -462,7 +474,7 @@ static gint yandex_service_real_get_pluggable_interface (SpitPluggable* base, gi
 	result = _tmp2_;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 466 "YandexPublishing.c"
+#line 478 "YandexPublishing.c"
 }
 
 
@@ -475,7 +487,7 @@ static const gchar* yandex_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.yandex-fotki";
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 479 "YandexPublishing.c"
+#line 491 "YandexPublishing.c"
 }
 
 
@@ -488,21 +500,19 @@ static const gchar* yandex_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Yandex.Fotki";
 #line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 492 "YandexPublishing.c"
+#line 504 "YandexPublishing.c"
 }
 
 
 static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
 	YandexService * self;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService);
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -514,56 +524,52 @@ static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 #line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	(*info).authors = _tmp0_;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = _ ("Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>");
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp1_ = g_strdup (_ ("Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"));
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 ((*info).copyright);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	(*info).copyright = _tmp2_;
+	(*info).copyright = _tmp1_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp3_ = g_strdup (RESOURCES_TRANSLATORS);
+	_tmp2_ = g_strdup (RESOURCES_TRANSLATORS);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 ((*info).translators);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	(*info).translators = _tmp3_;
+	(*info).translators = _tmp2_;
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp4_ = g_strdup (_VERSION);
+	_tmp3_ = g_strdup (_VERSION);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 ((*info).version);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	(*info).version = _tmp4_;
-#line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp5_ = _ ("Visit the Yandex.Fotki web site");
+	(*info).version = _tmp3_;
 #line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp6_ = g_strdup (_tmp5_);
+	_tmp4_ = g_strdup (_ ("Visit the Yandex.Fotki web site"));
 #line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 ((*info).website_name);
 #line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	(*info).website_name = _tmp6_;
+	(*info).website_name = _tmp4_;
 #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp7_ = g_strdup ("https://fotki.yandex.ru/");
+	_tmp5_ = g_strdup ("https://fotki.yandex.ru/");
 #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 ((*info).website_url);
 #line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	(*info).website_url = _tmp7_;
+	(*info).website_url = _tmp5_;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	(*info).is_license_wordwrapped = FALSE;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp8_ = g_strdup (RESOURCES_LICENSE);
+	_tmp6_ = g_strdup (RESOURCES_LICENSE);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 ((*info).license);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	(*info).license = _tmp8_;
-#line 559 "YandexPublishing.c"
+	(*info).license = _tmp6_;
+#line 565 "YandexPublishing.c"
 }
 
 
 static SpitPublishingPublisher* yandex_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host) {
 	YandexService * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingYandexYandexPublisher* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	PublishingYandexYandexPublisher* _tmp1_;
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService);
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -576,7 +582,7 @@ static SpitPublishingPublisher* yandex_service_real_create_publisher (SpitPublis
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 580 "YandexPublishing.c"
+#line 586 "YandexPublishing.c"
 }
 
 
@@ -589,7 +595,7 @@ static SpitPublishingPublisherMediaType yandex_service_real_get_supported_media
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 593 "YandexPublishing.c"
+#line 599 "YandexPublishing.c"
 }
 
 
@@ -597,7 +603,7 @@ static void yandex_service_real_activation (SpitPluggable* base, gboolean enable
 	YandexService * self;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService);
-#line 601 "YandexPublishing.c"
+#line 607 "YandexPublishing.c"
 }
 
 
@@ -607,21 +613,21 @@ YandexService* yandex_service_construct (GType object_type) {
 	self = (YandexService*) g_object_new (object_type, NULL);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 611 "YandexPublishing.c"
+#line 617 "YandexPublishing.c"
 }
 
 
 YandexService* yandex_service_new (void) {
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return yandex_service_construct (TYPE_YANDEX_SERVICE);
-#line 618 "YandexPublishing.c"
+#line 624 "YandexPublishing.c"
 }
 
 
 static void yandex_service_class_init (YandexServiceClass * klass) {
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	yandex_service_parent_class = g_type_class_peek_parent (klass);
-#line 625 "YandexPublishing.c"
+#line 631 "YandexPublishing.c"
 }
 
 
@@ -629,16 +635,16 @@ static void yandex_service_spit_pluggable_interface_init (SpitPluggableIface * i
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	yandex_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) yandex_service_real_get_pluggable_interface;
+	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) yandex_service_real_get_pluggable_interface;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->get_id = (const gchar* (*)(SpitPluggable*)) yandex_service_real_get_id;
+	iface->get_id = (const gchar* (*) (SpitPluggable *)) yandex_service_real_get_id;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) yandex_service_real_get_pluggable_name;
+	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) yandex_service_real_get_pluggable_name;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) yandex_service_real_get_info;
+	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) yandex_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->activation = (void (*)(SpitPluggable*, gboolean)) yandex_service_real_activation;
-#line 642 "YandexPublishing.c"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) yandex_service_real_activation;
+#line 648 "YandexPublishing.c"
 }
 
 
@@ -646,10 +652,10 @@ static void yandex_service_spit_publishing_service_interface_init (SpitPublishin
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	yandex_service_spit_publishing_service_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) yandex_service_real_create_publisher;
+	iface->create_publisher = (SpitPublishingPublisher* (*) (SpitPublishingService *, SpitPublishingPluginHost*)) yandex_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) yandex_service_real_get_supported_media;
-#line 653 "YandexPublishing.c"
+	iface->get_supported_media = (SpitPublishingPublisherMediaType (*) (SpitPublishingService *)) yandex_service_real_get_supported_media;
+#line 659 "YandexPublishing.c"
 }
 
 
@@ -675,9 +681,9 @@ GType yandex_service_get_type (void) {
 
 PublishingYandexTransaction* publishing_yandex_transaction_construct_with_url (GType object_type, PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method) {
 	PublishingYandexTransaction* self = NULL;
-	PublishingYandexSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp2_ = 0;
+	PublishingYandexSession* _tmp0_;
+	const gchar* _tmp1_;
+	PublishingRESTSupportHttpMethod _tmp2_;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -694,22 +700,22 @@ PublishingYandexTransaction* publishing_yandex_transaction_construct_with_url (G
 	publishing_yandex_transaction_add_headers (self);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 698 "YandexPublishing.c"
+#line 704 "YandexPublishing.c"
 }
 
 
 PublishingYandexTransaction* publishing_yandex_transaction_new_with_url (PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method) {
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_transaction_construct_with_url (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, url, method);
-#line 705 "YandexPublishing.c"
+#line 711 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_transaction_add_headers (PublishingYandexTransaction* self) {
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingYandexSession* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingYandexSession* _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_TRANSACTION (self));
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -724,13 +730,13 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti
 	_publishing_rest_support_session_unref0 (_tmp1_);
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (_tmp3_) {
-#line 728 "YandexPublishing.c"
-		PublishingRESTSupportSession* _tmp4_ = NULL;
-		PublishingYandexSession* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+#line 734 "YandexPublishing.c"
+		PublishingRESTSupportSession* _tmp4_;
+		PublishingYandexSession* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp4_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -753,15 +759,15 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti
 		_publishing_rest_support_session_unref0 (_tmp5_);
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Connection", "close");
-#line 757 "YandexPublishing.c"
+#line 763 "YandexPublishing.c"
 	}
 }
 
 
 PublishingYandexTransaction* publishing_yandex_transaction_construct (GType object_type, PublishingYandexSession* session, PublishingRESTSupportHttpMethod method) {
 	PublishingYandexTransaction* self = NULL;
-	PublishingYandexSession* _tmp0_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp1_ = 0;
+	PublishingYandexSession* _tmp0_;
+	PublishingRESTSupportHttpMethod _tmp1_;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -774,20 +780,20 @@ PublishingYandexTransaction* publishing_yandex_transaction_construct (GType obje
 	publishing_yandex_transaction_add_headers (self);
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 778 "YandexPublishing.c"
+#line 784 "YandexPublishing.c"
 }
 
 
 PublishingYandexTransaction* publishing_yandex_transaction_new (PublishingYandexSession* session, PublishingRESTSupportHttpMethod method) {
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_transaction_construct (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, method);
-#line 785 "YandexPublishing.c"
+#line 791 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self, const gchar* type, const gchar* data) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_TRANSACTION (self));
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -800,14 +806,14 @@ void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self,
 	_tmp1_ = type;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp0_, _tmp1_, (gulong) 0);
-#line 804 "YandexPublishing.c"
+#line 810 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_transaction_class_init (PublishingYandexTransactionClass * klass) {
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 811 "YandexPublishing.c"
+#line 817 "YandexPublishing.c"
 }
 
 
@@ -833,21 +839,21 @@ PublishingYandexSession* publishing_yandex_session_construct (GType object_type)
 	self = (PublishingYandexSession*) publishing_rest_support_session_construct (object_type, NULL);
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 837 "YandexPublishing.c"
+#line 843 "YandexPublishing.c"
 }
 
 
 PublishingYandexSession* publishing_yandex_session_new (void) {
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_session_construct (PUBLISHING_YANDEX_TYPE_SESSION);
-#line 844 "YandexPublishing.c"
+#line 850 "YandexPublishing.c"
 }
 
 
 static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTSupportSession* base) {
 	PublishingYandexSession * self;
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_SESSION, PublishingYandexSession);
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -856,7 +862,7 @@ static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTS
 	result = _tmp0_ != NULL;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 860 "YandexPublishing.c"
+#line 866 "YandexPublishing.c"
 }
 
 
@@ -867,13 +873,13 @@ void publishing_yandex_session_deauthenticate (PublishingYandexSession* self) {
 	_g_free0 (self->priv->auth_token);
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->auth_token = NULL;
-#line 871 "YandexPublishing.c"
+#line 877 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_session_set_auth_token (PublishingYandexSession* self, const gchar* token) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_SESSION (self));
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -886,14 +892,14 @@ void publishing_yandex_session_set_auth_token (PublishingYandexSession* self, co
 	_g_free0 (self->priv->auth_token);
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->auth_token = _tmp1_;
-#line 890 "YandexPublishing.c"
+#line 896 "YandexPublishing.c"
 }
 
 
 gchar* publishing_yandex_session_get_auth_token (PublishingYandexSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (self), NULL);
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -904,7 +910,7 @@ gchar* publishing_yandex_session_get_auth_token (PublishingYandexSession* self)
 	result = _tmp1_;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 908 "YandexPublishing.c"
+#line 914 "YandexPublishing.c"
 }
 
 
@@ -916,8 +922,8 @@ static void publishing_yandex_session_class_init (PublishingYandexSessionClass *
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYandexSessionPrivate));
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_yandex_session_real_is_authenticated;
-#line 921 "YandexPublishing.c"
+	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_yandex_session_real_is_authenticated;
+#line 927 "YandexPublishing.c"
 }
 
 
@@ -926,11 +932,11 @@ static void publishing_yandex_session_instance_init (PublishingYandexSession * s
 	self->priv = PUBLISHING_YANDEX_SESSION_GET_PRIVATE (self);
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->auth_token = NULL;
-#line 930 "YandexPublishing.c"
+#line 936 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_session_finalize (PublishingRESTSupportSession* obj) {
+static void publishing_yandex_session_finalize (PublishingRESTSupportSession * obj) {
 	PublishingYandexSession * self;
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_SESSION, PublishingYandexSession);
@@ -938,7 +944,7 @@ static void publishing_yandex_session_finalize (PublishingRESTSupportSession* ob
 	_g_free0 (self->priv->auth_token);
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_yandex_session_parent_class)->finalize (obj);
-#line 942 "YandexPublishing.c"
+#line 948 "YandexPublishing.c"
 }
 
 
@@ -956,7 +962,7 @@ GType publishing_yandex_session_get_type (void) {
 
 PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType object_type, const gchar* login_url) {
 	PublishingYandexWebAuthPane * self = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (login_url != NULL, NULL);
 #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -965,14 +971,14 @@ PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType ob
 	self = (PublishingYandexWebAuthPane*) g_object_new (object_type, "login-uri", _tmp0_, "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE, NULL);
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 969 "YandexPublishing.c"
+#line 975 "YandexPublishing.c"
 }
 
 
 PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_new (const gchar* login_url) {
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_web_auth_pane_construct (PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, login_url);
-#line 976 "YandexPublishing.c"
+#line 982 "YandexPublishing.c"
 }
 
 
@@ -981,22 +987,22 @@ static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_vie
 	result = publishing_yandex_web_auth_pane_on_decide_policy ((PublishingYandexWebAuthPane*) self, decision, type);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 985 "YandexPublishing.c"
+#line 991 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 	PublishingYandexWebAuthPane * self;
-	WebKitWebView* _tmp3_ = NULL;
-	WebKitWebView* _tmp4_ = NULL;
+	WebKitWebView* _tmp3_;
+	WebKitWebView* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 996 "YandexPublishing.c"
+#line 1002 "YandexPublishing.c"
 	{
 		GRegex* _tmp0_ = NULL;
-		GRegex* _tmp1_ = NULL;
-		GRegex* _tmp2_ = NULL;
+		GRegex* _tmp1_;
+		GRegex* _tmp2_;
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp1_ = g_regex_new ("(.*)#access_token=([a-zA-Z0-9]*)&", 0, 0, &_inner_error_);
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1005,7 +1011,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1009 "YandexPublishing.c"
+#line 1015 "YandexPublishing.c"
 				goto __catch39_g_regex_error;
 			}
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1014,7 +1020,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 			g_clear_error (&_inner_error_);
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 1018 "YandexPublishing.c"
+#line 1024 "YandexPublishing.c"
 		}
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp2_ = _tmp0_;
@@ -1026,7 +1032,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 		self->priv->re = _tmp2_;
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_regex_unref0 (_tmp0_);
-#line 1030 "YandexPublishing.c"
+#line 1036 "YandexPublishing.c"
 	}
 	goto __finally39;
 	__catch39_g_regex_error:
@@ -1040,7 +1046,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 		g_assert_not_reached ();
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (e);
-#line 1044 "YandexPublishing.c"
+#line 1050 "YandexPublishing.c"
 	}
 	__finally39:
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1051,7 +1057,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 		g_clear_error (&_inner_error_);
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 1055 "YandexPublishing.c"
+#line 1061 "YandexPublishing.c"
 	}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp3_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
@@ -1061,7 +1067,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 	g_signal_connect_object (_tmp4_, "decide-policy", (GCallback) _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy, self, 0);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1065 "YandexPublishing.c"
+#line 1071 "YandexPublishing.c"
 }
 
 
@@ -1069,41 +1075,41 @@ static void publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCo
 	PublishingYandexWebAuthPane * self;
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 1073 "YandexPublishing.c"
+#line 1079 "YandexPublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1080 "YandexPublishing.c"
+#line 1086 "YandexPublishing.c"
 }
 
 
 static WebKitNavigationAction* _vala_WebKitNavigationAction_copy (WebKitNavigationAction* self) {
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return g_boxed_copy (webkit_navigation_action_get_type (), self);
-#line 1087 "YandexPublishing.c"
+#line 1093 "YandexPublishing.c"
 }
 
 
 static gpointer __vala_WebKitNavigationAction_copy0 (gpointer self) {
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self ? _vala_WebKitNavigationAction_copy (self) : NULL;
-#line 1094 "YandexPublishing.c"
+#line 1100 "YandexPublishing.c"
 }
 
 
 static void _vala_WebKitNavigationAction_free (WebKitNavigationAction* self) {
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_boxed_free (webkit_navigation_action_get_type (), self);
-#line 1101 "YandexPublishing.c"
+#line 1107 "YandexPublishing.c"
 }
 
 
 static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYandexWebAuthPane* self, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type) {
 	gboolean result = FALSE;
-	WebKitPolicyDecisionType _tmp0_ = 0;
+	WebKitPolicyDecisionType _tmp0_;
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_WEB_AUTH_PANE (self), FALSE);
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1114,29 +1120,29 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 	switch (_tmp0_) {
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION:
-#line 1118 "YandexPublishing.c"
+#line 1124 "YandexPublishing.c"
 		{
 			WebKitNavigationPolicyDecision* n_decision = NULL;
-			WebKitPolicyDecision* _tmp1_ = NULL;
-			WebKitNavigationPolicyDecision* _tmp2_ = NULL;
+			WebKitPolicyDecision* _tmp1_;
+			WebKitNavigationPolicyDecision* _tmp2_;
 			WebKitNavigationAction* action = NULL;
-			WebKitNavigationPolicyDecision* _tmp3_ = NULL;
-			WebKitNavigationAction* _tmp4_ = NULL;
-			WebKitNavigationAction* _tmp5_ = NULL;
-			WebKitNavigationAction* _tmp6_ = NULL;
+			WebKitNavigationPolicyDecision* _tmp3_;
+			WebKitNavigationAction* _tmp4_;
+			WebKitNavigationAction* _tmp5_;
+			WebKitNavigationAction* _tmp6_;
 			gchar* uri = NULL;
-			WebKitNavigationAction* _tmp7_ = NULL;
-			WebKitURIRequest* _tmp8_ = NULL;
-			const gchar* _tmp9_ = NULL;
-			const gchar* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-			const gchar* _tmp12_ = NULL;
+			WebKitNavigationAction* _tmp7_;
+			WebKitURIRequest* _tmp8_;
+			const gchar* _tmp9_;
+			const gchar* _tmp10_;
+			gchar* _tmp11_;
+			const gchar* _tmp12_;
 			GMatchInfo* info = NULL;
-			GRegex* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
+			GRegex* _tmp13_;
+			const gchar* _tmp14_;
 			GMatchInfo* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
-			WebKitPolicyDecision* _tmp28_ = NULL;
+			gboolean _tmp16_;
+			WebKitPolicyDecision* _tmp28_;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp1_ = decision;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1183,18 +1189,18 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 			info = _tmp15_;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_tmp16_) {
-#line 1187 "YandexPublishing.c"
+#line 1193 "YandexPublishing.c"
 				gchar* access_token = NULL;
-				GMatchInfo* _tmp17_ = NULL;
-				gchar** _tmp18_ = NULL;
-				gchar** _tmp19_ = NULL;
-				gchar** _tmp20_ = NULL;
-				gint _tmp20__length1 = 0;
-				const gchar* _tmp21_ = NULL;
-				gchar* _tmp22_ = NULL;
-				gchar* _tmp23_ = NULL;
-				const gchar* _tmp24_ = NULL;
-				const gchar* _tmp25_ = NULL;
+				GMatchInfo* _tmp17_;
+				gchar** _tmp18_;
+				gchar** _tmp19_;
+				gchar** _tmp20_;
+				gint _tmp20__length1;
+				const gchar* _tmp21_;
+				gchar* _tmp22_;
+				gchar* _tmp23_;
+				const gchar* _tmp24_;
+				const gchar* _tmp25_;
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp17_ = info;
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1223,13 +1229,13 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 				_tmp25_ = access_token;
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (_tmp25_ != NULL) {
-#line 1227 "YandexPublishing.c"
-					const gchar* _tmp26_ = NULL;
-					WebKitPolicyDecision* _tmp27_ = NULL;
+#line 1233 "YandexPublishing.c"
+					const gchar* _tmp26_;
+					WebKitPolicyDecision* _tmp27_;
 #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp26_ = access_token;
 #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					g_signal_emit_by_name (self, "login-succeeded", _tmp26_);
+					g_signal_emit (self, publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_SUCCEEDED_SIGNAL], 0, _tmp26_);
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp27_ = decision;
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1246,15 +1252,15 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 					_g_object_unref0 (n_decision);
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 1250 "YandexPublishing.c"
+#line 1256 "YandexPublishing.c"
 				} else {
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-					g_signal_emit_by_name (self, "login-failed");
-#line 1254 "YandexPublishing.c"
+					g_signal_emit (self, publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_FAILED_SIGNAL], 0);
+#line 1260 "YandexPublishing.c"
 				}
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_g_free0 (access_token);
-#line 1258 "YandexPublishing.c"
+#line 1264 "YandexPublishing.c"
 			}
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp28_ = decision;
@@ -1270,20 +1276,20 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 			_g_object_unref0 (n_decision);
 #line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			break;
-#line 1274 "YandexPublishing.c"
+#line 1280 "YandexPublishing.c"
 		}
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		case WEBKIT_POLICY_DECISION_TYPE_RESPONSE:
-#line 1278 "YandexPublishing.c"
+#line 1284 "YandexPublishing.c"
 		{
-			WebKitPolicyDecision* _tmp29_ = NULL;
+			WebKitPolicyDecision* _tmp29_;
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp29_ = decision;
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			webkit_policy_decision_use (_tmp29_);
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			break;
-#line 1287 "YandexPublishing.c"
+#line 1293 "YandexPublishing.c"
 		}
 		default:
 		{
@@ -1291,14 +1297,14 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 			result = FALSE;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return result;
-#line 1295 "YandexPublishing.c"
+#line 1301 "YandexPublishing.c"
 		}
 	}
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	result = TRUE;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 1302 "YandexPublishing.c"
+#line 1308 "YandexPublishing.c"
 }
 
 
@@ -1308,27 +1314,27 @@ static void publishing_yandex_web_auth_pane_class_init (PublishingYandexWebAuthP
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYandexWebAuthPanePrivate));
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	((GObjectClass *) klass)->constructed = (void (*)(GObject*)) publishing_yandex_web_auth_pane_real_constructed;
+	((GObjectClass *) klass)->constructed = (void (*) (GObject *)) publishing_yandex_web_auth_pane_real_constructed;
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*)(ShotwellPluginsCommonWebAuthenticationPane*)) publishing_yandex_web_auth_pane_real_on_page_load;
+	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*) (ShotwellPluginsCommonWebAuthenticationPane *)) publishing_yandex_web_auth_pane_real_on_page_load;
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_yandex_web_auth_pane_finalize;
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_new ("login_succeeded", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+	publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_SUCCEEDED_SIGNAL] = g_signal_new ("login-succeeded", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_new ("login_failed", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1321 "YandexPublishing.c"
+	publishing_yandex_web_auth_pane_signals[PUBLISHING_YANDEX_WEB_AUTH_PANE_LOGIN_FAILED_SIGNAL] = g_signal_new ("login-failed", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 1327 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_web_auth_pane_instance_init (PublishingYandexWebAuthPane * self) {
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv = PUBLISHING_YANDEX_WEB_AUTH_PANE_GET_PRIVATE (self);
-#line 1328 "YandexPublishing.c"
+#line 1334 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_web_auth_pane_finalize (GObject* obj) {
+static void publishing_yandex_web_auth_pane_finalize (GObject * obj) {
 	PublishingYandexWebAuthPane * self;
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
@@ -1336,7 +1342,7 @@ static void publishing_yandex_web_auth_pane_finalize (GObject* obj) {
 	_g_regex_unref0 (self->priv->re);
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (publishing_yandex_web_auth_pane_parent_class)->finalize (obj);
-#line 1340 "YandexPublishing.c"
+#line 1346 "YandexPublishing.c"
 }
 
 
@@ -1358,21 +1364,21 @@ PublishingYandexPublishOptions* publishing_yandex_publish_options_construct (GTy
 	self = (PublishingYandexPublishOptions*) g_type_create_instance (object_type);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 1362 "YandexPublishing.c"
+#line 1368 "YandexPublishing.c"
 }
 
 
 PublishingYandexPublishOptions* publishing_yandex_publish_options_new (void) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_publish_options_construct (PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS);
-#line 1369 "YandexPublishing.c"
+#line 1375 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_value_publish_options_init (GValue* value) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1376 "YandexPublishing.c"
+#line 1382 "YandexPublishing.c"
 }
 
 
@@ -1381,7 +1387,7 @@ static void publishing_yandex_value_publish_options_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_publish_options_unref (value->data[0].v_pointer);
-#line 1385 "YandexPublishing.c"
+#line 1391 "YandexPublishing.c"
 	}
 }
 
@@ -1391,11 +1397,11 @@ static void publishing_yandex_value_publish_options_copy_value (const GValue* sr
 	if (src_value->data[0].v_pointer) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_yandex_publish_options_ref (src_value->data[0].v_pointer);
-#line 1395 "YandexPublishing.c"
+#line 1401 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1399 "YandexPublishing.c"
+#line 1405 "YandexPublishing.c"
 	}
 }
 
@@ -1403,66 +1409,66 @@ static void publishing_yandex_value_publish_options_copy_value (const GValue* sr
 static gpointer publishing_yandex_value_publish_options_peek_pointer (const GValue* value) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1407 "YandexPublishing.c"
+#line 1413 "YandexPublishing.c"
 }
 
 
 static gchar* publishing_yandex_value_publish_options_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1414 "YandexPublishing.c"
-		PublishingYandexPublishOptions* object;
+#line 1420 "YandexPublishing.c"
+		PublishingYandexPublishOptions * object;
 		object = collect_values[0].v_pointer;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1421 "YandexPublishing.c"
+#line 1427 "YandexPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1425 "YandexPublishing.c"
+#line 1431 "YandexPublishing.c"
 		}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = publishing_yandex_publish_options_ref (object);
-#line 1429 "YandexPublishing.c"
+#line 1435 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1433 "YandexPublishing.c"
+#line 1439 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return NULL;
-#line 1437 "YandexPublishing.c"
+#line 1443 "YandexPublishing.c"
 }
 
 
 static gchar* publishing_yandex_value_publish_options_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingYandexPublishOptions** object_p;
+	PublishingYandexPublishOptions ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (!object_p) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1448 "YandexPublishing.c"
+#line 1454 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		*object_p = NULL;
-#line 1454 "YandexPublishing.c"
+#line 1460 "YandexPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1458 "YandexPublishing.c"
+#line 1464 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		*object_p = publishing_yandex_publish_options_ref (value->data[0].v_pointer);
-#line 1462 "YandexPublishing.c"
+#line 1468 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return NULL;
-#line 1466 "YandexPublishing.c"
+#line 1472 "YandexPublishing.c"
 }
 
 
@@ -1476,7 +1482,7 @@ GParamSpec* publishing_yandex_param_spec_publish_options (const gchar* name, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1480 "YandexPublishing.c"
+#line 1486 "YandexPublishing.c"
 }
 
 
@@ -1485,12 +1491,12 @@ gpointer publishing_yandex_value_get_publish_options (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS), NULL);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1489 "YandexPublishing.c"
+#line 1495 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_value_set_publish_options (GValue* value, gpointer v_object) {
-	PublishingYandexPublishOptions* old;
+	PublishingYandexPublishOptions * old;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS));
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1505,23 +1511,23 @@ void publishing_yandex_value_set_publish_options (GValue* value, gpointer v_obje
 		value->data[0].v_pointer = v_object;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_publish_options_ref (value->data[0].v_pointer);
-#line 1509 "YandexPublishing.c"
+#line 1515 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1513 "YandexPublishing.c"
+#line 1519 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (old) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_publish_options_unref (old);
-#line 1519 "YandexPublishing.c"
+#line 1525 "YandexPublishing.c"
 	}
 }
 
 
 void publishing_yandex_value_take_publish_options (GValue* value, gpointer v_object) {
-	PublishingYandexPublishOptions* old;
+	PublishingYandexPublishOptions * old;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS));
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1534,17 +1540,17 @@ void publishing_yandex_value_take_publish_options (GValue* value, gpointer v_obj
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1538 "YandexPublishing.c"
+#line 1544 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1542 "YandexPublishing.c"
+#line 1548 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (old) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_publish_options_unref (old);
-#line 1548 "YandexPublishing.c"
+#line 1554 "YandexPublishing.c"
 	}
 }
 
@@ -1554,7 +1560,7 @@ static void publishing_yandex_publish_options_class_init (PublishingYandexPublis
 	publishing_yandex_publish_options_parent_class = g_type_class_peek_parent (klass);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	((PublishingYandexPublishOptionsClass *) klass)->finalize = publishing_yandex_publish_options_finalize;
-#line 1558 "YandexPublishing.c"
+#line 1564 "YandexPublishing.c"
 }
 
 
@@ -1569,11 +1575,11 @@ static void publishing_yandex_publish_options_instance_init (PublishingYandexPub
 	self->destination_album_url = NULL;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->ref_count = 1;
-#line 1573 "YandexPublishing.c"
+#line 1579 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_publish_options_finalize (PublishingYandexPublishOptions* obj) {
+static void publishing_yandex_publish_options_finalize (PublishingYandexPublishOptions * obj) {
 	PublishingYandexPublishOptions * self;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS, PublishingYandexPublishOptions);
@@ -1585,7 +1591,7 @@ static void publishing_yandex_publish_options_finalize (PublishingYandexPublishO
 	_g_free0 (self->destination_album);
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (self->destination_album_url);
-#line 1589 "YandexPublishing.c"
+#line 1595 "YandexPublishing.c"
 }
 
 
@@ -1604,18 +1610,18 @@ GType publishing_yandex_publish_options_get_type (void) {
 
 
 gpointer publishing_yandex_publish_options_ref (gpointer instance) {
-	PublishingYandexPublishOptions* self;
+	PublishingYandexPublishOptions * self;
 	self = instance;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return instance;
-#line 1614 "YandexPublishing.c"
+#line 1620 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_publish_options_unref (gpointer instance) {
-	PublishingYandexPublishOptions* self;
+	PublishingYandexPublishOptions * self;
 	self = instance;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1623,7 +1629,7 @@ void publishing_yandex_publish_options_unref (gpointer instance) {
 		PUBLISHING_YANDEX_PUBLISH_OPTIONS_GET_CLASS (self)->finalize (self);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1627 "YandexPublishing.c"
+#line 1633 "YandexPublishing.c"
 	}
 }
 
@@ -1637,7 +1643,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_yandex_publishing_opti
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 1641 "YandexPublishing.c"
+#line 1647 "YandexPublishing.c"
 }
 
 
@@ -1645,7 +1651,7 @@ static void publishing_yandex_publishing_options_pane_real_on_pane_installed (Sp
 	PublishingYandexPublishingOptionsPane * self;
 #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 1649 "YandexPublishing.c"
+#line 1655 "YandexPublishing.c"
 }
 
 
@@ -1653,15 +1659,15 @@ static void publishing_yandex_publishing_options_pane_real_on_pane_uninstalled (
 	PublishingYandexPublishingOptionsPane * self;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 1657 "YandexPublishing.c"
+#line 1663 "YandexPublishing.c"
 }
 
 
 static GtkWidget* publishing_yandex_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	PublishingYandexPublishingOptionsPane * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1672,28 +1678,28 @@ static GtkWidget* publishing_yandex_publishing_options_pane_real_get_widget (Spi
 	result = _tmp1_;
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 1676 "YandexPublishing.c"
+#line 1682 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_publishing_options_pane_on_publish_clicked ((PublishingYandexPublishingOptionsPane*) self);
-#line 1683 "YandexPublishing.c"
+#line 1689 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_publishing_options_pane_on_logout_clicked ((PublishingYandexPublishingOptionsPane*) self);
-#line 1690 "YandexPublishing.c"
+#line 1696 "YandexPublishing.c"
 }
 
 
 PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_construct (GType object_type, PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host) {
 	PublishingYandexPublishingOptionsPane * self = NULL;
-	PublishingYandexPublishOptions* _tmp0_ = NULL;
-	GtkBox* _tmp1_ = NULL;
+	PublishingYandexPublishOptions* _tmp0_;
+	GtkBox* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_PUBLISH_OPTIONS (options), NULL);
@@ -1715,33 +1721,33 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 	_g_object_unref0 (self->priv->box);
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->box = _tmp1_;
-#line 1719 "YandexPublishing.c"
+#line 1725 "YandexPublishing.c"
 	{
-		GtkBuilder* _tmp2_ = NULL;
-		GtkBuilder* _tmp3_ = NULL;
-		GtkBuilder* _tmp4_ = NULL;
+		GtkBuilder* _tmp2_;
+		GtkBuilder* _tmp3_;
+		GtkBuilder* _tmp4_;
 		GtkWidget* content = NULL;
-		GtkBuilder* _tmp5_ = NULL;
-		GObject* _tmp6_ = NULL;
-		GtkWidget* _tmp7_ = NULL;
-		GtkBuilder* _tmp8_ = NULL;
-		GObject* _tmp9_ = NULL;
-		GtkComboBoxText* _tmp10_ = NULL;
-		GtkComboBoxText* _tmp23_ = NULL;
-		GtkBuilder* _tmp24_ = NULL;
-		GObject* _tmp25_ = NULL;
-		GtkButton* _tmp26_ = NULL;
-		GtkBuilder* _tmp27_ = NULL;
-		GObject* _tmp28_ = NULL;
-		GtkButton* _tmp29_ = NULL;
-		GtkButton* _tmp30_ = NULL;
-		GtkButton* _tmp31_ = NULL;
-		GtkWidget* _tmp32_ = NULL;
-		GtkContainer* _tmp33_ = NULL;
-		GtkContainer* _tmp34_ = NULL;
-		GtkWidget* _tmp35_ = NULL;
-		GtkBox* _tmp36_ = NULL;
-		GtkWidget* _tmp37_ = NULL;
+		GtkBuilder* _tmp5_;
+		GObject* _tmp6_;
+		GtkWidget* _tmp7_;
+		GtkBuilder* _tmp8_;
+		GObject* _tmp9_;
+		GtkComboBoxText* _tmp10_;
+		GtkComboBoxText* _tmp23_;
+		GtkBuilder* _tmp24_;
+		GObject* _tmp25_;
+		GtkButton* _tmp26_;
+		GtkBuilder* _tmp27_;
+		GObject* _tmp28_;
+		GtkButton* _tmp29_;
+		GtkButton* _tmp30_;
+		GtkButton* _tmp31_;
+		GtkWidget* _tmp32_;
+		GtkContainer* _tmp33_;
+		GtkContainer* _tmp34_;
+		GtkWidget* _tmp35_;
+		GtkBox* _tmp36_;
+		GtkWidget* _tmp37_;
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp2_ = gtk_builder_new ();
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1754,7 +1760,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		gtk_builder_add_from_resource (_tmp3_, PLUGIN_RESOURCE_PATH "/yandex_publish_model.ui", &_inner_error_);
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1758 "YandexPublishing.c"
+#line 1764 "YandexPublishing.c"
 			goto __catch40_g_error;
 		}
 #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1779,15 +1785,15 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		_g_object_unref0 (self->priv->album_list);
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		self->priv->album_list = _tmp10_;
-#line 1783 "YandexPublishing.c"
+#line 1789 "YandexPublishing.c"
 		{
 			GeeIterator* _key_it = NULL;
-			GeeHashMap* _tmp11_ = NULL;
-			GeeSet* _tmp12_ = NULL;
-			GeeSet* _tmp13_ = NULL;
-			GeeSet* _tmp14_ = NULL;
-			GeeIterator* _tmp15_ = NULL;
-			GeeIterator* _tmp16_ = NULL;
+			GeeHashMap* _tmp11_;
+			GeeSet* _tmp12_;
+			GeeSet* _tmp13_;
+			GeeSet* _tmp14_;
+			GeeIterator* _tmp15_;
+			GeeIterator* _tmp16_;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp11_ = list;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1806,14 +1812,14 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 			_key_it = _tmp16_;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			while (TRUE) {
-#line 1810 "YandexPublishing.c"
-				GeeIterator* _tmp17_ = NULL;
-				gboolean _tmp18_ = FALSE;
+#line 1816 "YandexPublishing.c"
+				GeeIterator* _tmp17_;
+				gboolean _tmp18_;
 				gchar* key = NULL;
-				GeeIterator* _tmp19_ = NULL;
-				gpointer _tmp20_ = NULL;
-				GtkComboBoxText* _tmp21_ = NULL;
-				const gchar* _tmp22_ = NULL;
+				GeeIterator* _tmp19_;
+				gpointer _tmp20_;
+				GtkComboBoxText* _tmp21_;
+				const gchar* _tmp22_;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp17_ = _key_it;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1822,7 +1828,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 				if (!_tmp18_) {
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 1826 "YandexPublishing.c"
+#line 1832 "YandexPublishing.c"
 				}
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp19_ = _key_it;
@@ -1838,11 +1844,11 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 				gtk_combo_box_text_append_text (_tmp21_, _tmp22_);
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_g_free0 (key);
-#line 1842 "YandexPublishing.c"
+#line 1848 "YandexPublishing.c"
 			}
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_object_unref0 (_key_it);
-#line 1846 "YandexPublishing.c"
+#line 1852 "YandexPublishing.c"
 		}
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp23_ = self->priv->album_list;
@@ -1894,14 +1900,14 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		gtk_box_pack_start (_tmp36_, _tmp37_, TRUE, TRUE, (guint) 0);
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_object_unref0 (content);
-#line 1898 "YandexPublishing.c"
+#line 1904 "YandexPublishing.c"
 	}
 	goto __finally40;
 	__catch40_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp38_ = NULL;
-		const gchar* _tmp39_ = NULL;
+		GError* _tmp38_;
+		const gchar* _tmp39_;
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		e = _inner_error_;
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1914,7 +1920,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		g_warning ("YandexPublishing.vala:214: Could not load UI: %s", _tmp39_);
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (e);
-#line 1918 "YandexPublishing.c"
+#line 1924 "YandexPublishing.c"
 	}
 	__finally40:
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1925,18 +1931,18 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		g_clear_error (&_inner_error_);
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return NULL;
-#line 1929 "YandexPublishing.c"
+#line 1935 "YandexPublishing.c"
 	}
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 1933 "YandexPublishing.c"
+#line 1939 "YandexPublishing.c"
 }
 
 
 PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_new (PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host) {
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_publishing_options_pane_construct (PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, options, list, host);
-#line 1940 "YandexPublishing.c"
+#line 1946 "YandexPublishing.c"
 }
 
 
@@ -1944,36 +1950,36 @@ static void publishing_yandex_publishing_options_pane_on_logout_clicked (Publish
 #line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_emit_by_name (self, "logout");
-#line 1949 "YandexPublishing.c"
+	g_signal_emit (self, publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL], 0);
+#line 1955 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_publishing_options_pane_on_publish_clicked (PublishingYandexPublishingOptionsPane* self) {
-	PublishingYandexPublishOptions* _tmp0_ = NULL;
-	GtkComboBoxText* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	PublishingYandexPublishOptions* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	gchar* _tmp2_;
 	GtkCheckButton* tmp = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GObject* _tmp4_ = NULL;
-	GtkCheckButton* _tmp5_ = NULL;
-	PublishingYandexPublishOptions* _tmp6_ = NULL;
-	GtkCheckButton* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_ = FALSE;
-	GtkBuilder* _tmp10_ = NULL;
-	GObject* _tmp11_ = NULL;
-	GtkCheckButton* _tmp12_ = NULL;
-	PublishingYandexPublishOptions* _tmp13_ = NULL;
-	GtkCheckButton* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	gboolean _tmp16_ = FALSE;
+	GtkBuilder* _tmp3_;
+	GObject* _tmp4_;
+	GtkCheckButton* _tmp5_;
+	PublishingYandexPublishOptions* _tmp6_;
+	GtkCheckButton* _tmp7_;
+	gboolean _tmp8_;
+	gboolean _tmp9_;
+	GtkBuilder* _tmp10_;
+	GObject* _tmp11_;
+	GtkCheckButton* _tmp12_;
+	PublishingYandexPublishOptions* _tmp13_;
+	GtkCheckButton* _tmp14_;
+	gboolean _tmp15_;
+	gboolean _tmp16_;
 	GtkComboBoxText* access_type = NULL;
-	GtkBuilder* _tmp17_ = NULL;
-	GObject* _tmp18_ = NULL;
-	GtkComboBoxText* _tmp19_ = NULL;
-	PublishingYandexPublishOptions* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
+	GtkBuilder* _tmp17_;
+	GObject* _tmp18_;
+	GtkComboBoxText* _tmp19_;
+	PublishingYandexPublishOptions* _tmp20_;
+	gchar* _tmp21_;
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2041,12 +2047,12 @@ static void publishing_yandex_publishing_options_pane_on_publish_clicked (Publis
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp20_->access_type = _tmp21_;
 #line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_emit_by_name (self, "publish");
+	g_signal_emit (self, publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL], 0);
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (access_type);
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (tmp);
-#line 2050 "YandexPublishing.c"
+#line 2056 "YandexPublishing.c"
 }
 
 
@@ -2058,10 +2064,10 @@ static void publishing_yandex_publishing_options_pane_class_init (PublishingYand
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_yandex_publishing_options_pane_finalize;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_new ("publish", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_PUBLISH_SIGNAL] = g_signal_new ("publish", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_signal_new ("logout", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 2065 "YandexPublishing.c"
+	publishing_yandex_publishing_options_pane_signals[PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_LOGOUT_SIGNAL] = g_signal_new ("logout", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 2071 "YandexPublishing.c"
 }
 
 
@@ -2069,25 +2075,25 @@ static void publishing_yandex_publishing_options_pane_spit_publishing_dialog_pan
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_yandex_publishing_options_pane_real_get_preferred_geometry;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_on_pane_installed;
+	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_yandex_publishing_options_pane_real_on_pane_installed;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_on_pane_uninstalled;
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_yandex_publishing_options_pane_real_on_pane_uninstalled;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_get_widget;
-#line 2080 "YandexPublishing.c"
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_yandex_publishing_options_pane_real_get_widget;
+#line 2086 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_publishing_options_pane_instance_init (PublishingYandexPublishingOptionsPane * self) {
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv = PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 2087 "YandexPublishing.c"
+#line 2093 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_publishing_options_pane_finalize (GObject* obj) {
+static void publishing_yandex_publishing_options_pane_finalize (GObject * obj) {
 	PublishingYandexPublishingOptionsPane * self;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
@@ -2103,7 +2109,7 @@ static void publishing_yandex_publishing_options_pane_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->album_list);
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (publishing_yandex_publishing_options_pane_parent_class)->finalize (obj);
-#line 2107 "YandexPublishing.c"
+#line 2113 "YandexPublishing.c"
 }
 
 
@@ -2123,10 +2129,10 @@ GType publishing_yandex_publishing_options_pane_get_type (void) {
 
 PublishingYandexUploader* publishing_yandex_uploader_construct (GType object_type, PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable** photos, int photos_length1) {
 	PublishingYandexUploader* self = NULL;
-	PublishingYandexSession* _tmp0_ = NULL;
-	SpitPublishingPublishable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingYandexPublishOptions* _tmp2_ = NULL;
+	PublishingYandexSession* _tmp0_;
+	SpitPublishingPublishable** _tmp1_;
+	gint _tmp1__length1;
+	PublishingYandexPublishOptions* _tmp2_;
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2145,27 +2151,27 @@ PublishingYandexUploader* publishing_yandex_uploader_construct (GType object_typ
 	self->priv->options = _tmp2_;
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 2149 "YandexPublishing.c"
+#line 2155 "YandexPublishing.c"
 }
 
 
 PublishingYandexUploader* publishing_yandex_uploader_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable** photos, int photos_length1) {
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_uploader_construct (PUBLISHING_YANDEX_TYPE_UPLOADER, session, options, photos, photos_length1);
-#line 2156 "YandexPublishing.c"
+#line 2162 "YandexPublishing.c"
 }
 
 
 static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
 	PublishingYandexUploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingYandexSession* _tmp1_ = NULL;
-	PublishingYandexPublishOptions* _tmp2_ = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
-	SpitPublishingPublishable* _tmp4_ = NULL;
-	PublishingYandexUploadTransaction* _tmp5_ = NULL;
-	PublishingRESTSupportTransaction* _tmp6_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingYandexSession* _tmp1_;
+	PublishingYandexPublishOptions* _tmp2_;
+	SpitPublishingPublishable* _tmp3_;
+	SpitPublishingPublishable* _tmp4_;
+	PublishingYandexUploadTransaction* _tmp5_;
+	PublishingRESTSupportTransaction* _tmp6_;
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader);
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2194,7 +2200,7 @@ static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_
 	result = _tmp6_;
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2198 "YandexPublishing.c"
+#line 2204 "YandexPublishing.c"
 }
 
 
@@ -2206,25 +2212,25 @@ static void publishing_yandex_uploader_class_init (PublishingYandexUploaderClass
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYandexUploaderPrivate));
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_yandex_uploader_real_create_transaction;
-#line 2211 "YandexPublishing.c"
+	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_yandex_uploader_real_create_transaction;
+#line 2217 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_uploader_instance_init (PublishingYandexUploader * self) {
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv = PUBLISHING_YANDEX_UPLOADER_GET_PRIVATE (self);
-#line 2218 "YandexPublishing.c"
+#line 2224 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
+static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
 	PublishingYandexUploader * self;
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader);
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_yandex_uploader_parent_class)->finalize (obj);
-#line 2228 "YandexPublishing.c"
+#line 2234 "YandexPublishing.c"
 }
 
 
@@ -2242,26 +2248,26 @@ GType publishing_yandex_uploader_get_type (void) {
 
 static gchar* bool_to_string (gboolean self) {
 	gchar* result = NULL;
-#line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 37 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (self) {
-#line 2248 "YandexPublishing.c"
-		gchar* _tmp0_ = NULL;
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2254 "YandexPublishing.c"
+		gchar* _tmp0_;
+#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strdup ("true");
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp0_;
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2256 "YandexPublishing.c"
+#line 2262 "YandexPublishing.c"
 	} else {
-		gchar* _tmp1_ = NULL;
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp1_;
+#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = g_strdup ("false");
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp1_;
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 2265 "YandexPublishing.c"
+#line 2271 "YandexPublishing.c"
 	}
 }
 
@@ -2269,142 +2275,142 @@ static gchar* bool_to_string (gboolean self) {
 static void _vala_SoupMultipart_free (SoupMultipart* self) {
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 2273 "YandexPublishing.c"
+#line 2279 "YandexPublishing.c"
 }
 
 
 static guint8* string_get_data (const gchar* self, int* result_length1) {
 	guint8* result;
 	guint8* res = NULL;
-	gint res_length1 = 0;
-	gint _res_size_ = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	guint8* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	guint8* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint res_length1;
+	gint _res_size_;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	guint8* _tmp3_;
+	gint _tmp3__length1;
+	guint8* _tmp4_;
+	gint _tmp4__length1;
+#line 1428 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1430 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 2317 "YandexPublishing.c"
+#line 2323 "YandexPublishing.c"
 	}
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1431 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 2323 "YandexPublishing.c"
+#line 2329 "YandexPublishing.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	var = (g_free (var), NULL);
-#line 2330 "YandexPublishing.c"
+#line 2336 "YandexPublishing.c"
 }
 
 
 static void _vala_SoupBuffer_free (SoupBuffer* self) {
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 2337 "YandexPublishing.c"
+#line 2343 "YandexPublishing.c"
 }
 
 
 PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construct (GType object_type, PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo) {
 	PublishingYandexUploadTransaction* self = NULL;
-	PublishingYandexSession* _tmp0_ = NULL;
-	PublishingYandexPublishOptions* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	PublishingYandexPublishOptions* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	PublishingYandexPublishOptions* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
+	PublishingYandexSession* _tmp0_;
+	PublishingYandexPublishOptions* _tmp1_;
+	const gchar* _tmp2_;
+	SpitPublishingPublishable* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	PublishingYandexPublishOptions* _tmp6_;
+	const gchar* _tmp7_;
+	PublishingYandexPublishOptions* _tmp8_;
+	const gchar* _tmp9_;
 	SoupMultipart* message_parts = NULL;
-	SoupMultipart* _tmp10_ = NULL;
-	SpitPublishingPublishable* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	PublishingYandexPublishOptions* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	PublishingYandexPublishOptions* _tmp18_ = NULL;
-	gboolean _tmp19_ = FALSE;
-	gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	PublishingYandexPublishOptions* _tmp22_ = NULL;
-	const gchar* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
+	SoupMultipart* _tmp10_;
+	SpitPublishingPublishable* _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	PublishingYandexPublishOptions* _tmp14_;
+	gboolean _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	PublishingYandexPublishOptions* _tmp18_;
+	gboolean _tmp19_;
+	gchar* _tmp20_;
+	gchar* _tmp21_;
+	PublishingYandexPublishOptions* _tmp22_;
+	const gchar* _tmp23_;
+	gchar* _tmp24_;
+	gchar* _tmp25_;
 	gchar* photo_data = NULL;
 	gsize data_length = 0UL;
 	gint image_part_num = 0;
-	gint _tmp40_ = 0;
+	gint _tmp40_;
 	SoupBuffer* bindable_data = NULL;
-	guint8* _tmp41_ = NULL;
-	gint _tmp41__length1 = 0;
-	guint8* _tmp42_ = NULL;
-	gint _tmp42__length1 = 0;
-	SoupBuffer* _tmp43_ = NULL;
-	SpitPublishingPublishable* _tmp44_ = NULL;
-	GFile* _tmp45_ = NULL;
-	GFile* _tmp46_ = NULL;
-	gchar* _tmp47_ = NULL;
-	gchar* _tmp48_ = NULL;
+	guint8* _tmp41_;
+	gint _tmp41__length1;
+	guint8* _tmp42_;
+	gint _tmp42__length1;
+	SoupBuffer* _tmp43_;
+	SpitPublishingPublishable* _tmp44_;
+	GFile* _tmp45_;
+	GFile* _tmp46_;
+	gchar* _tmp47_;
+	gchar* _tmp48_;
 	SoupMessageHeaders* image_part_header = NULL;
 	SoupBuffer* image_part_body = NULL;
 	SoupMessageHeaders* _tmp49_ = NULL;
 	SoupBuffer* _tmp50_ = NULL;
 	GHashTable* _result_ = NULL;
-	GHashFunc _tmp51_ = NULL;
-	GEqualFunc _tmp52_ = NULL;
-	GHashTable* _tmp53_ = NULL;
-	gchar* _tmp54_ = NULL;
-	gchar* _tmp55_ = NULL;
-	gchar* _tmp56_ = NULL;
-	gchar* _tmp57_ = NULL;
+	GHashFunc _tmp51_;
+	GEqualFunc _tmp52_;
+	GHashTable* _tmp53_;
+	gchar* _tmp54_;
+	gchar* _tmp55_;
+	gchar* _tmp56_;
+	gchar* _tmp57_;
 	SoupMessage* outbound_message = NULL;
-	gchar* _tmp58_ = NULL;
-	gchar* _tmp59_ = NULL;
-	SoupMessage* _tmp60_ = NULL;
-	SoupMessage* _tmp61_ = NULL;
-	SoupMessageHeaders* _tmp62_ = NULL;
-	PublishingYandexSession* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
-	gchar* _tmp65_ = NULL;
-	gchar* _tmp66_ = NULL;
-	gchar* _tmp67_ = NULL;
-	SoupMessageHeaders* _tmp68_ = NULL;
+	gchar* _tmp58_;
+	gchar* _tmp59_;
+	SoupMessage* _tmp60_;
+	SoupMessage* _tmp61_;
+	SoupMessageHeaders* _tmp62_;
+	PublishingYandexSession* _tmp63_;
+	gchar* _tmp64_;
+	gchar* _tmp65_;
+	gchar* _tmp66_;
+	gchar* _tmp67_;
+	SoupMessageHeaders* _tmp68_;
 	GError * _inner_error_ = NULL;
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
@@ -2490,13 +2496,13 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 	soup_multipart_append_form_string (message_parts, "access", _tmp25_);
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp25_);
-#line 2494 "YandexPublishing.c"
+#line 2500 "YandexPublishing.c"
 	{
-		SpitPublishingPublishable* _tmp26_ = NULL;
-		GFile* _tmp27_ = NULL;
-		GFile* _tmp28_ = NULL;
-		gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
+		SpitPublishingPublishable* _tmp26_;
+		GFile* _tmp27_;
+		GFile* _tmp28_;
+		gchar* _tmp29_;
+		gchar* _tmp30_;
 		gchar* _tmp31_ = NULL;
 		gsize _tmp32_ = 0UL;
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2525,7 +2531,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 2529 "YandexPublishing.c"
+#line 2535 "YandexPublishing.c"
 				goto __catch41_g_file_error;
 			}
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2538,20 +2544,20 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 			g_clear_error (&_inner_error_);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return NULL;
-#line 2542 "YandexPublishing.c"
+#line 2548 "YandexPublishing.c"
 		}
 	}
 	goto __finally41;
 	__catch41_g_file_error:
 	{
 		GError* e = NULL;
-		SpitPublishingPublishable* _tmp33_ = NULL;
-		GFile* _tmp34_ = NULL;
-		GFile* _tmp35_ = NULL;
-		gchar* _tmp36_ = NULL;
-		gchar* _tmp37_ = NULL;
-		GError* _tmp38_ = NULL;
-		const gchar* _tmp39_ = NULL;
+		SpitPublishingPublishable* _tmp33_;
+		GFile* _tmp34_;
+		GFile* _tmp35_;
+		gchar* _tmp36_;
+		gchar* _tmp37_;
+		GError* _tmp38_;
+		const gchar* _tmp39_;
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		e = _inner_error_;
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2578,7 +2584,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 		_g_object_unref0 (_tmp35_);
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (e);
-#line 2582 "YandexPublishing.c"
+#line 2588 "YandexPublishing.c"
 	}
 	__finally41:
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2593,7 +2599,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 		g_clear_error (&_inner_error_);
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return NULL;
-#line 2597 "YandexPublishing.c"
+#line 2603 "YandexPublishing.c"
 	}
 #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp40_ = soup_multipart_get_length (message_parts);
@@ -2701,21 +2707,21 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 	__vala_SoupMultipart_free0 (message_parts);
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 2705 "YandexPublishing.c"
+#line 2711 "YandexPublishing.c"
 }
 
 
 PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo) {
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_upload_transaction_construct (PUBLISHING_YANDEX_TYPE_UPLOAD_TRANSACTION, session, options, photo);
-#line 2712 "YandexPublishing.c"
+#line 2718 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_upload_transaction_class_init (PublishingYandexUploadTransactionClass * klass) {
 #line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 2719 "YandexPublishing.c"
+#line 2725 "YandexPublishing.c"
 }
 
 
@@ -2737,11 +2743,11 @@ GType publishing_yandex_upload_transaction_get_type (void) {
 
 PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
 	PublishingYandexYandexPublisher * self = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	PublishingYandexSession* _tmp2_ = NULL;
-	GeeHashMap* _tmp3_ = NULL;
-	PublishingYandexPublishOptions* _tmp4_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	PublishingYandexSession* _tmp2_;
+	GeeHashMap* _tmp3_;
+	PublishingYandexPublishOptions* _tmp4_;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2776,21 +2782,21 @@ PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (G
 	self->priv->options = _tmp4_;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 2780 "YandexPublishing.c"
+#line 2786 "YandexPublishing.c"
 }
 
 
 PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_yandex_publisher_construct (PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, service, host);
-#line 2787 "YandexPublishing.c"
+#line 2793 "YandexPublishing.c"
 }
 
 
 gchar* publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingYandexYandexPublisher* self) {
 	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self), NULL);
 #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2801,13 +2807,13 @@ gchar* publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingY
 	result = _tmp1_;
 #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2805 "YandexPublishing.c"
+#line 2811 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYandexYandexPublisher* self, const gchar* auth_token) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	const gchar* _tmp1_;
 #line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2818,27 +2824,27 @@ void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYan
 	_tmp1_ = auth_token;
 #line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token", _tmp1_);
-#line 2822 "YandexPublishing.c"
+#line 2828 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_invalidate_persistent_session (PublishingYandexYandexPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token");
-#line 2834 "YandexPublishing.c"
+#line 2840 "YandexPublishing.c"
 }
 
 
 gboolean publishing_yandex_yandex_publisher_is_persistent_session_available (PublishingYandexYandexPublisher* self) {
 	gboolean result = FALSE;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self), FALSE);
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2853,14 +2859,14 @@ gboolean publishing_yandex_yandex_publisher_is_persistent_session_available (Pub
 	result = _tmp2_;
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2857 "YandexPublishing.c"
+#line 2863 "YandexPublishing.c"
 }
 
 
 static gboolean publishing_yandex_yandex_publisher_real_is_running (SpitPublishingPublisher* base) {
 	PublishingYandexYandexPublisher * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2869,15 +2875,15 @@ static gboolean publishing_yandex_yandex_publisher_real_is_running (SpitPublishi
 	result = _tmp0_;
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2873 "YandexPublishing.c"
+#line 2879 "YandexPublishing.c"
 }
 
 
 static SpitPublishingService* publishing_yandex_yandex_publisher_real_get_service (SpitPublishingPublisher* base) {
 	PublishingYandexYandexPublisher * self;
 	SpitPublishingService* result = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingService* _tmp1_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingService* _tmp1_;
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
 #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2888,7 +2894,7 @@ static SpitPublishingService* publishing_yandex_yandex_publisher_real_get_servic
 	result = _tmp1_;
 #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2892 "YandexPublishing.c"
+#line 2898 "YandexPublishing.c"
 }
 
 
@@ -2902,7 +2908,7 @@ static gchar* publishing_yandex_yandex_publisher_check_response (PublishingYande
 	result = NULL;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2906 "YandexPublishing.c"
+#line 2912 "YandexPublishing.c"
 }
 
 
@@ -2915,45 +2921,45 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 	title = NULL;
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	link = NULL;
-#line 2919 "YandexPublishing.c"
+#line 2925 "YandexPublishing.c"
 	{
 		xmlNode* c = NULL;
-		xmlNode* _tmp0_ = NULL;
-		xmlNode* _tmp1_ = NULL;
+		xmlNode* _tmp0_;
+		xmlNode* _tmp1_;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp0_ = e;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp1_ = _tmp0_->children;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		c = _tmp1_;
-#line 2930 "YandexPublishing.c"
+#line 2936 "YandexPublishing.c"
 		{
 			gboolean _tmp2_ = FALSE;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp2_ = TRUE;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			while (TRUE) {
-#line 2937 "YandexPublishing.c"
-				xmlNode* _tmp5_ = NULL;
-				xmlNode* _tmp6_ = NULL;
-				const gchar* _tmp7_ = NULL;
+#line 2943 "YandexPublishing.c"
+				xmlNode* _tmp5_;
+				xmlNode* _tmp6_;
+				const gchar* _tmp7_;
 				gboolean _tmp10_ = FALSE;
-				xmlNode* _tmp11_ = NULL;
-				const gchar* _tmp12_ = NULL;
+				xmlNode* _tmp11_;
+				const gchar* _tmp12_;
 				gboolean _tmp18_ = FALSE;
-				const gchar* _tmp19_ = NULL;
+				const gchar* _tmp19_;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (!_tmp2_) {
-#line 2948 "YandexPublishing.c"
-					xmlNode* _tmp3_ = NULL;
-					xmlNode* _tmp4_ = NULL;
+#line 2954 "YandexPublishing.c"
+					xmlNode* _tmp3_;
+					xmlNode* _tmp4_;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp3_ = c;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp4_ = _tmp3_->next;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					c = _tmp4_;
-#line 2957 "YandexPublishing.c"
+#line 2963 "YandexPublishing.c"
 				}
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp2_ = FALSE;
@@ -2963,7 +2969,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 				if (!(_tmp5_ != NULL)) {
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 2967 "YandexPublishing.c"
+#line 2973 "YandexPublishing.c"
 				}
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp6_ = c;
@@ -2971,9 +2977,9 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 				_tmp7_ = _tmp6_->name;
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (g_strcmp0 (_tmp7_, "title") == 0) {
-#line 2975 "YandexPublishing.c"
-					xmlNode* _tmp8_ = NULL;
-					gchar* _tmp9_ = NULL;
+#line 2981 "YandexPublishing.c"
+					xmlNode* _tmp8_;
+					gchar* _tmp9_;
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp8_ = c;
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2982,7 +2988,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 					_g_free0 (title);
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					title = _tmp9_;
-#line 2986 "YandexPublishing.c"
+#line 2992 "YandexPublishing.c"
 				}
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp11_ = c;
@@ -2990,10 +2996,10 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 				_tmp12_ = _tmp11_->name;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (g_strcmp0 (_tmp12_, "link") == 0) {
-#line 2994 "YandexPublishing.c"
-					xmlNode* _tmp13_ = NULL;
-					gchar* _tmp14_ = NULL;
-					gchar* _tmp15_ = NULL;
+#line 3000 "YandexPublishing.c"
+					xmlNode* _tmp13_;
+					gchar* _tmp14_;
+					gchar* _tmp15_;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp13_ = c;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3004,17 +3010,17 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 					_tmp10_ = g_strcmp0 (_tmp15_, "photos") == 0;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_g_free0 (_tmp15_);
-#line 3008 "YandexPublishing.c"
+#line 3014 "YandexPublishing.c"
 				} else {
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp10_ = FALSE;
-#line 3012 "YandexPublishing.c"
+#line 3018 "YandexPublishing.c"
 				}
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (_tmp10_) {
-#line 3016 "YandexPublishing.c"
-					xmlNode* _tmp16_ = NULL;
-					gchar* _tmp17_ = NULL;
+#line 3022 "YandexPublishing.c"
+					xmlNode* _tmp16_;
+					gchar* _tmp17_;
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp16_ = c;
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3023,32 +3029,32 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 					_g_free0 (link);
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					link = _tmp17_;
-#line 3027 "YandexPublishing.c"
+#line 3033 "YandexPublishing.c"
 				}
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp19_ = title;
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (_tmp19_ != NULL) {
-#line 3033 "YandexPublishing.c"
-					const gchar* _tmp20_ = NULL;
+#line 3039 "YandexPublishing.c"
+					const gchar* _tmp20_;
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp20_ = link;
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp18_ = _tmp20_ != NULL;
-#line 3039 "YandexPublishing.c"
+#line 3045 "YandexPublishing.c"
 				} else {
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp18_ = FALSE;
-#line 3043 "YandexPublishing.c"
+#line 3049 "YandexPublishing.c"
 				}
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (_tmp18_) {
-#line 3047 "YandexPublishing.c"
-					const gchar* _tmp21_ = NULL;
-					const gchar* _tmp22_ = NULL;
-					GeeHashMap* _tmp23_ = NULL;
-					const gchar* _tmp24_ = NULL;
-					const gchar* _tmp25_ = NULL;
+#line 3053 "YandexPublishing.c"
+					const gchar* _tmp21_;
+					const gchar* _tmp22_;
+					GeeHashMap* _tmp23_;
+					const gchar* _tmp24_;
+					const gchar* _tmp25_;
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp21_ = title;
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3073,7 +3079,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 					link = NULL;
 #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 3077 "YandexPublishing.c"
+#line 3083 "YandexPublishing.c"
 				}
 			}
 		}
@@ -3082,7 +3088,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 	_g_free0 (link);
 #line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (title);
-#line 3086 "YandexPublishing.c"
+#line 3092 "YandexPublishing.c"
 }
 
 
@@ -3091,18 +3097,18 @@ static gchar* _publishing_yandex_yandex_publisher_check_response_publishing_rest
 	result = publishing_yandex_yandex_publisher_check_response ((PublishingYandexYandexPublisher*) self, doc);
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 3095 "YandexPublishing.c"
+#line 3101 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYandexPublisher* self, const gchar* data, GError** error) {
 	PublishingRESTSupportXmlDocument* doc = NULL;
-	const gchar* _tmp0_ = NULL;
-	PublishingRESTSupportXmlDocument* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	PublishingRESTSupportXmlDocument* _tmp1_;
 	xmlNode* root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp2_ = NULL;
-	xmlNode* _tmp3_ = NULL;
-	xmlNode* _tmp4_ = NULL;
+	PublishingRESTSupportXmlDocument* _tmp2_;
+	xmlNode* _tmp3_;
+	xmlNode* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
@@ -3122,7 +3128,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
 			g_propagate_error (error, _inner_error_);
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3126 "YandexPublishing.c"
+#line 3132 "YandexPublishing.c"
 		} else {
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3130,7 +3136,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
 			g_clear_error (&_inner_error_);
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3134 "YandexPublishing.c"
+#line 3140 "YandexPublishing.c"
 		}
 	}
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3153,7 +3159,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3157 "YandexPublishing.c"
+#line 3163 "YandexPublishing.c"
 		} else {
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
@@ -3163,22 +3169,22 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
 			g_clear_error (&_inner_error_);
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3167 "YandexPublishing.c"
+#line 3173 "YandexPublishing.c"
 		}
 	}
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_xml_document_unref0 (doc);
-#line 3172 "YandexPublishing.c"
+#line 3178 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandexPublisher* self, const gchar* data, GError** error) {
 	PublishingRESTSupportXmlDocument* doc = NULL;
-	const gchar* _tmp0_ = NULL;
-	PublishingRESTSupportXmlDocument* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	PublishingRESTSupportXmlDocument* _tmp1_;
 	xmlNode* root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp2_ = NULL;
-	xmlNode* _tmp3_ = NULL;
+	PublishingRESTSupportXmlDocument* _tmp2_;
+	xmlNode* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
@@ -3198,7 +3204,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 			g_propagate_error (error, _inner_error_);
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3202 "YandexPublishing.c"
+#line 3208 "YandexPublishing.c"
 		} else {
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3206,7 +3212,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 			g_clear_error (&_inner_error_);
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3210 "YandexPublishing.c"
+#line 3216 "YandexPublishing.c"
 		}
 	}
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3215,41 +3221,41 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 	_tmp3_ = publishing_rest_support_xml_document_get_root_node (_tmp2_);
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	root = _tmp3_;
-#line 3219 "YandexPublishing.c"
+#line 3225 "YandexPublishing.c"
 	{
 		xmlNode* e = NULL;
-		xmlNode* _tmp4_ = NULL;
-		xmlNode* _tmp5_ = NULL;
+		xmlNode* _tmp4_;
+		xmlNode* _tmp5_;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp4_ = root;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp5_ = _tmp4_->children;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		e = _tmp5_;
-#line 3230 "YandexPublishing.c"
+#line 3236 "YandexPublishing.c"
 		{
 			gboolean _tmp6_ = FALSE;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp6_ = TRUE;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			while (TRUE) {
-#line 3237 "YandexPublishing.c"
-				xmlNode* _tmp9_ = NULL;
-				xmlNode* _tmp10_ = NULL;
-				const gchar* _tmp11_ = NULL;
-				xmlNode* _tmp12_ = NULL;
+#line 3243 "YandexPublishing.c"
+				xmlNode* _tmp9_;
+				xmlNode* _tmp10_;
+				const gchar* _tmp11_;
+				xmlNode* _tmp12_;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (!_tmp6_) {
-#line 3244 "YandexPublishing.c"
-					xmlNode* _tmp7_ = NULL;
-					xmlNode* _tmp8_ = NULL;
+#line 3250 "YandexPublishing.c"
+					xmlNode* _tmp7_;
+					xmlNode* _tmp8_;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp7_ = e;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp8_ = _tmp7_->next;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					e = _tmp8_;
-#line 3253 "YandexPublishing.c"
+#line 3259 "YandexPublishing.c"
 				}
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp6_ = FALSE;
@@ -3259,7 +3265,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 				if (!(_tmp9_ != NULL)) {
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 3263 "YandexPublishing.c"
+#line 3269 "YandexPublishing.c"
 				}
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp10_ = e;
@@ -3269,7 +3275,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 				if (g_strcmp0 (_tmp11_, "entry") != 0) {
 #line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					continue;
-#line 3273 "YandexPublishing.c"
+#line 3279 "YandexPublishing.c"
 				}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp12_ = e;
@@ -3285,7 +3291,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 						_publishing_rest_support_xml_document_unref0 (doc);
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						return;
-#line 3289 "YandexPublishing.c"
+#line 3295 "YandexPublishing.c"
 					} else {
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_publishing_rest_support_xml_document_unref0 (doc);
@@ -3295,7 +3301,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 						g_clear_error (&_inner_error_);
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						return;
-#line 3299 "YandexPublishing.c"
+#line 3305 "YandexPublishing.c"
 					}
 				}
 			}
@@ -3303,31 +3309,31 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 	}
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_xml_document_unref0 (doc);
-#line 3307 "YandexPublishing.c"
+#line 3313 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_album_creation_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 3314 "YandexPublishing.c"
+#line 3320 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_album_creation_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3321 "YandexPublishing.c"
+#line 3327 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_album_creation_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	GError* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	GError* _tmp4_;
+	const gchar* _tmp5_;
 #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3350,21 +3356,21 @@ static void publishing_yandex_yandex_publisher_album_creation_error (PublishingY
 	_tmp5_ = _tmp4_->message;
 #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_warning ("YandexPublishing.vala:394: Album creation error: %s", _tmp5_);
-#line 3354 "YandexPublishing.c"
+#line 3360 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_album_creation_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	GeeHashMap* _tmp9_ = NULL;
-	PublishingYandexPublishOptions* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gpointer _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	GeeHashMap* _tmp9_;
+	PublishingYandexPublishOptions* _tmp10_;
+	const gchar* _tmp11_;
+	gpointer _tmp12_;
+	gchar* _tmp13_;
+	gboolean _tmp14_;
 	GError * _inner_error_ = NULL;
 #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
@@ -3382,11 +3388,11 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self);
-#line 3386 "YandexPublishing.c"
+#line 3392 "YandexPublishing.c"
 	{
-		PublishingRESTSupportTransaction* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+		PublishingRESTSupportTransaction* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp4_ = t;
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3401,7 +3407,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3405 "YandexPublishing.c"
+#line 3411 "YandexPublishing.c"
 				goto __catch42_spit_publishing_publishing_error;
 			}
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3410,15 +3416,15 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 			g_clear_error (&_inner_error_);
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3414 "YandexPublishing.c"
+#line 3420 "YandexPublishing.c"
 		}
 	}
 	goto __finally42;
 	__catch42_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
+		SpitPublishingPluginHost* _tmp7_;
+		GError* _tmp8_;
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3433,7 +3439,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 		_g_error_free0 (err);
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 3437 "YandexPublishing.c"
+#line 3443 "YandexPublishing.c"
 	}
 	__finally42:
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3444,7 +3450,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 		g_clear_error (&_inner_error_);
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 3448 "YandexPublishing.c"
+#line 3454 "YandexPublishing.c"
 	}
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp9_ = self->priv->album_list;
@@ -3464,11 +3470,11 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 	if (_tmp14_) {
 #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_start_upload (self);
-#line 3468 "YandexPublishing.c"
+#line 3474 "YandexPublishing.c"
 	} else {
-		SpitPublishingPluginHost* _tmp15_ = NULL;
-		GError* _tmp16_ = NULL;
-		GError* _tmp17_ = NULL;
+		SpitPublishingPluginHost* _tmp15_;
+		GError* _tmp16_;
+		GError* _tmp17_;
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp15_ = self->priv->host;
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3479,22 +3485,22 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 		spit_publishing_plugin_host_post_error (_tmp15_, _tmp17_);
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (_tmp17_);
-#line 3483 "YandexPublishing.c"
+#line 3489 "YandexPublishing.c"
 	}
 }
 
 
 static void publishing_yandex_yandex_publisher_create_destination_album (PublishingYandexYandexPublisher* self) {
 	gchar* album = NULL;
-	PublishingYandexPublishOptions* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	PublishingYandexPublishOptions* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 	gchar* data = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp3_;
 	PublishingYandexTransaction* t = NULL;
-	PublishingYandexSession* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	PublishingYandexTransaction* _tmp6_ = NULL;
+	PublishingYandexSession* _tmp4_;
+	const gchar* _tmp5_;
+	PublishingYandexTransaction* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
@@ -3525,7 +3531,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self, 0);
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 3528 "YandexPublishing.c"
+#line 3534 "YandexPublishing.c"
 	{
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -3533,7 +3539,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3536 "YandexPublishing.c"
+#line 3542 "YandexPublishing.c"
 				goto __catch43_spit_publishing_publishing_error;
 			}
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3548,15 +3554,15 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 			g_clear_error (&_inner_error_);
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3551 "YandexPublishing.c"
+#line 3557 "YandexPublishing.c"
 		}
 	}
 	goto __finally43;
 	__catch43_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
+		SpitPublishingPluginHost* _tmp7_;
+		GError* _tmp8_;
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3569,7 +3575,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 		spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 3572 "YandexPublishing.c"
+#line 3578 "YandexPublishing.c"
 	}
 	__finally43:
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3586,7 +3592,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 		g_clear_error (&_inner_error_);
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 3589 "YandexPublishing.c"
+#line 3595 "YandexPublishing.c"
 	}
 #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
@@ -3594,32 +3600,32 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 	_g_free0 (data);
 #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (album);
-#line 3597 "YandexPublishing.c"
+#line 3603 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_upload_complete ((PublishingYandexYandexPublisher*) self, _sender, num_photos_published);
-#line 3604 "YandexPublishing.c"
+#line 3610 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_upload_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3611 "YandexPublishing.c"
+#line 3617 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published) {
-	PublishingRESTSupportBatchUploader* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gint _tmp4_ = 0;
-	SpitPublishingPluginHost* _tmp8_ = NULL;
-	SpitPublishingPluginHost* _tmp9_ = NULL;
+	PublishingRESTSupportBatchUploader* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportBatchUploader* _tmp2_;
+	guint _tmp3_;
+	gint _tmp4_;
+	SpitPublishingPluginHost* _tmp8_;
+	SpitPublishingPluginHost* _tmp9_;
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3640,10 +3646,10 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan
 	_tmp4_ = num_published;
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (_tmp4_ == 0) {
-#line 3643 "YandexPublishing.c"
-		SpitPublishingPluginHost* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
+#line 3649 "YandexPublishing.c"
+		SpitPublishingPluginHost* _tmp5_;
+		GError* _tmp6_;
+		GError* _tmp7_;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp5_ = self->priv->host;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3654,7 +3660,7 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan
 		spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_);
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (_tmp7_);
-#line 3657 "YandexPublishing.c"
+#line 3663 "YandexPublishing.c"
 	}
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp8_ = self->priv->host;
@@ -3664,17 +3670,17 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan
 	_tmp9_ = self->priv->host;
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp9_);
-#line 3667 "YandexPublishing.c"
+#line 3673 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_on_upload_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err) {
-	PublishingRESTSupportBatchUploader* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	GError* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	PublishingRESTSupportBatchUploader* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportBatchUploader* _tmp2_;
+	guint _tmp3_;
+	GError* _tmp4_;
+	const gchar* _tmp5_;
 #line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3697,18 +3703,18 @@ static void publishing_yandex_yandex_publisher_on_upload_error (PublishingYandex
 	_tmp5_ = _tmp4_->message;
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_warning ("YandexPublishing.vala:448: Photo upload error: %s", _tmp5_);
-#line 3700 "YandexPublishing.c"
+#line 3706 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_on_upload_status_updated (PublishingYandexYandexPublisher* self, gint file_number, gdouble completed_fraction) {
-	gdouble _tmp0_ = 0.0;
-	SpitPublishingProgressCallback _tmp1_ = NULL;
-	void* _tmp1__target = NULL;
-	SpitPublishingProgressCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	gint _tmp3_ = 0;
-	gdouble _tmp4_ = 0.0;
+	gdouble _tmp0_;
+	SpitPublishingProgressCallback _tmp1_;
+	void* _tmp1__target;
+	SpitPublishingProgressCallback _tmp2_;
+	void* _tmp2__target;
+	gint _tmp3_;
+	gdouble _tmp4_;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3732,38 +3738,38 @@ static void publishing_yandex_yandex_publisher_on_upload_status_updated (Publish
 	_tmp4_ = completed_fraction;
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ (_tmp3_, _tmp4_, _tmp2__target);
-#line 3734 "YandexPublishing.c"
+#line 3740 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_upload_status_updated ((PublishingYandexYandexPublisher*) self, file_number, fraction_complete);
-#line 3741 "YandexPublishing.c"
+#line 3747 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_start_upload (PublishingYandexYandexPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	void* _tmp2_ = NULL;
-	GDestroyNotify _tmp3_ = NULL;
-	SpitPublishingProgressCallback _tmp4_ = NULL;
-	PublishingYandexPublishOptions* _tmp5_ = NULL;
-	GeeHashMap* _tmp6_ = NULL;
-	PublishingYandexPublishOptions* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gpointer _tmp9_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	void* _tmp2_;
+	GDestroyNotify _tmp3_;
+	SpitPublishingProgressCallback _tmp4_;
+	PublishingYandexPublishOptions* _tmp5_;
+	GeeHashMap* _tmp6_;
+	PublishingYandexPublishOptions* _tmp7_;
+	const gchar* _tmp8_;
+	gpointer _tmp9_;
 	SpitPublishingPublishable** publishables = NULL;
-	SpitPublishingPluginHost* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	SpitPublishingPublishable** _tmp12_ = NULL;
-	gint publishables_length1 = 0;
-	gint _publishables_size_ = 0;
+	SpitPublishingPluginHost* _tmp10_;
+	gint _tmp11_;
+	SpitPublishingPublishable** _tmp12_;
+	gint publishables_length1;
+	gint _publishables_size_;
 	PublishingYandexUploader* uploader = NULL;
-	PublishingYandexSession* _tmp13_ = NULL;
-	PublishingYandexPublishOptions* _tmp14_ = NULL;
-	PublishingYandexUploader* _tmp15_ = NULL;
+	PublishingYandexSession* _tmp13_;
+	PublishingYandexPublishOptions* _tmp14_;
+	PublishingYandexUploader* _tmp15_;
 #line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3830,13 +3836,13 @@ static void publishing_yandex_yandex_publisher_start_upload (PublishingYandexYan
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
 #line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 3832 "YandexPublishing.c"
+#line 3838 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandexPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-	PublishingYandexSession* _tmp1_ = NULL;
+	gboolean _tmp0_;
+	PublishingYandexSession* _tmp1_;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3845,7 +3851,7 @@ static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandex
 	if (!_tmp0_) {
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 3847 "YandexPublishing.c"
+#line 3853 "YandexPublishing.c"
 	}
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = self->priv->session;
@@ -3857,24 +3863,24 @@ static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandex
 	self->priv->running = FALSE;
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_publisher_start (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 3859 "YandexPublishing.c"
+#line 3865 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYandexPublisher* self) {
-	PublishingYandexPublishOptions* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
-	PublishingYandexPublishOptions* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gpointer _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	GeeHashMap* _tmp7_ = NULL;
-	PublishingYandexPublishOptions* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gpointer _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	PublishingYandexPublishOptions* _tmp0_;
+	const gchar* _tmp1_;
+	GeeHashMap* _tmp2_;
+	PublishingYandexPublishOptions* _tmp3_;
+	const gchar* _tmp4_;
+	gpointer _tmp5_;
+	gchar* _tmp6_;
+	GeeHashMap* _tmp7_;
+	PublishingYandexPublishOptions* _tmp8_;
+	const gchar* _tmp9_;
+	gpointer _tmp10_;
+	gchar* _tmp11_;
+	gboolean _tmp12_;
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3913,11 +3919,11 @@ static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYande
 	if (_tmp12_) {
 #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_create_destination_album (self);
-#line 3915 "YandexPublishing.c"
+#line 3921 "YandexPublishing.c"
 	} else {
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_start_upload (self);
-#line 3919 "YandexPublishing.c"
+#line 3925 "YandexPublishing.c"
 	}
 }
 
@@ -3925,24 +3931,24 @@ static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYande
 static void _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_service_get_album_list_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 3927 "YandexPublishing.c"
+#line 3933 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_service_get_album_list_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3934 "YandexPublishing.c"
+#line 3940 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_service_get_album_list_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	GError* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	GError* _tmp4_;
+	const gchar* _tmp5_;
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3967,38 +3973,38 @@ void publishing_yandex_yandex_publisher_service_get_album_list_error (Publishing
 	_tmp5_ = _tmp4_->message;
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_warning ("YandexPublishing.vala:498: Failed to get album list: %s", _tmp5_);
-#line 3969 "YandexPublishing.c"
+#line 3975 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish (PublishingYandexPublishingOptionsPane* _sender, gpointer self) {
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_publish ((PublishingYandexYandexPublisher*) self);
-#line 3976 "YandexPublishing.c"
+#line 3982 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout (PublishingYandexPublishingOptionsPane* _sender, gpointer self) {
 #line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_logout ((PublishingYandexYandexPublisher*) self);
-#line 3983 "YandexPublishing.c"
+#line 3989 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_service_get_album_list_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 	PublishingYandexPublishingOptionsPane* publishing_options_pane = NULL;
-	PublishingYandexPublishOptions* _tmp12_ = NULL;
-	GeeHashMap* _tmp13_ = NULL;
-	SpitPublishingPluginHost* _tmp14_ = NULL;
-	PublishingYandexPublishingOptionsPane* _tmp15_ = NULL;
-	SpitPublishingPluginHost* _tmp16_ = NULL;
+	PublishingYandexPublishOptions* _tmp12_;
+	GeeHashMap* _tmp13_;
+	SpitPublishingPluginHost* _tmp14_;
+	PublishingYandexPublishingOptionsPane* _tmp15_;
+	SpitPublishingPluginHost* _tmp16_;
 	GError * _inner_error_ = NULL;
 #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
@@ -4026,11 +4032,11 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 	g_debug ("YandexPublishing.vala:505: service_get_album_list_complete: %s", _tmp6_);
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp6_);
-#line 4028 "YandexPublishing.c"
+#line 4034 "YandexPublishing.c"
 	{
-		PublishingRESTSupportTransaction* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+		PublishingRESTSupportTransaction* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp7_ = t;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4045,7 +4051,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4047 "YandexPublishing.c"
+#line 4053 "YandexPublishing.c"
 				goto __catch44_spit_publishing_publishing_error;
 			}
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4054,15 +4060,15 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 			g_clear_error (&_inner_error_);
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 4056 "YandexPublishing.c"
+#line 4062 "YandexPublishing.c"
 		}
 	}
 	goto __finally44;
 	__catch44_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp10_ = NULL;
-		GError* _tmp11_ = NULL;
+		SpitPublishingPluginHost* _tmp10_;
+		GError* _tmp11_;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4075,7 +4081,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 		spit_publishing_plugin_host_post_error (_tmp10_, _tmp11_);
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4077 "YandexPublishing.c"
+#line 4083 "YandexPublishing.c"
 	}
 	__finally44:
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4086,7 +4092,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 		g_clear_error (&_inner_error_);
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4088 "YandexPublishing.c"
+#line 4094 "YandexPublishing.c"
 	}
 #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp12_ = self->priv->options;
@@ -4108,17 +4114,17 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 	spit_publishing_plugin_host_install_dialog_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (publishing_options_pane);
-#line 4110 "YandexPublishing.c"
+#line 4116 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandexYandexPublisher* self, const gchar* url) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	PublishingYandexTransaction* t = NULL;
-	PublishingYandexSession* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	PublishingYandexTransaction* _tmp4_ = NULL;
+	PublishingYandexSession* _tmp2_;
+	const gchar* _tmp3_;
+	PublishingYandexTransaction* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
@@ -4144,7 +4150,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self, 0);
 #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 4146 "YandexPublishing.c"
+#line 4152 "YandexPublishing.c"
 	{
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -4152,7 +4158,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4154 "YandexPublishing.c"
+#line 4160 "YandexPublishing.c"
 				goto __catch45_spit_publishing_publishing_error;
 			}
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4163,15 +4169,15 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 			g_clear_error (&_inner_error_);
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 4165 "YandexPublishing.c"
+#line 4171 "YandexPublishing.c"
 		}
 	}
 	goto __finally45;
 	__catch45_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
+		SpitPublishingPluginHost* _tmp5_;
+		GError* _tmp6_;
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4184,7 +4190,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 		spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4186 "YandexPublishing.c"
+#line 4192 "YandexPublishing.c"
 	}
 	__finally45:
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4197,35 +4203,35 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 		g_clear_error (&_inner_error_);
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4199 "YandexPublishing.c"
+#line 4205 "YandexPublishing.c"
 	}
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
-#line 4203 "YandexPublishing.c"
+#line 4209 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_fetch_account_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 4210 "YandexPublishing.c"
+#line 4216 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_fetch_account_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 4217 "YandexPublishing.c"
+#line 4223 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	GError* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	GError* _tmp4_;
+	const gchar* _tmp5_;
 #line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4248,18 +4254,18 @@ void publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYan
 	_tmp5_ = _tmp4_->message;
 #line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_warning ("YandexPublishing.vala:538: Failed to fetch account info: %s", _tmp5_);
-#line 4250 "YandexPublishing.c"
+#line 4256 "YandexPublishing.c"
 }
 
 
 void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandexYandexPublisher* self, PublishingRESTSupportTransaction* t) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
+	PublishingRESTSupportTransaction* _tmp0_;
+	guint _tmp1_;
+	PublishingRESTSupportTransaction* _tmp2_;
+	guint _tmp3_;
+	PublishingRESTSupportTransaction* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
 	GError * _inner_error_ = NULL;
 #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
@@ -4287,17 +4293,17 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 	g_debug ("YandexPublishing.vala:545: account info: %s", _tmp6_);
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp6_);
-#line 4289 "YandexPublishing.c"
+#line 4295 "YandexPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
-		PublishingRESTSupportTransaction* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp10_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp11_ = NULL;
+		PublishingRESTSupportTransaction* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
+		PublishingRESTSupportXmlDocument* _tmp10_;
+		PublishingRESTSupportXmlDocument* _tmp11_;
 		xmlNode* root = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_ = NULL;
-		xmlNode* _tmp13_ = NULL;
+		PublishingRESTSupportXmlDocument* _tmp12_;
+		xmlNode* _tmp13_;
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp7_ = t;
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4316,7 +4322,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4318 "YandexPublishing.c"
+#line 4324 "YandexPublishing.c"
 				goto __catch46_spit_publishing_publishing_error;
 			}
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4325,7 +4331,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 			g_clear_error (&_inner_error_);
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 4327 "YandexPublishing.c"
+#line 4333 "YandexPublishing.c"
 		}
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp12_ = doc;
@@ -4333,40 +4339,40 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		_tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_);
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		root = _tmp13_;
-#line 4335 "YandexPublishing.c"
+#line 4341 "YandexPublishing.c"
 		{
 			xmlNode* work = NULL;
-			xmlNode* _tmp14_ = NULL;
-			xmlNode* _tmp15_ = NULL;
+			xmlNode* _tmp14_;
+			xmlNode* _tmp15_;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp14_ = root;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp15_ = _tmp14_->children;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			work = _tmp15_;
-#line 4346 "YandexPublishing.c"
+#line 4352 "YandexPublishing.c"
 			{
 				gboolean _tmp16_ = FALSE;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp16_ = TRUE;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				while (TRUE) {
-#line 4353 "YandexPublishing.c"
-					xmlNode* _tmp19_ = NULL;
-					xmlNode* _tmp20_ = NULL;
-					const gchar* _tmp21_ = NULL;
+#line 4359 "YandexPublishing.c"
+					xmlNode* _tmp19_;
+					xmlNode* _tmp20_;
+					const gchar* _tmp21_;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					if (!_tmp16_) {
-#line 4359 "YandexPublishing.c"
-						xmlNode* _tmp17_ = NULL;
-						xmlNode* _tmp18_ = NULL;
+#line 4365 "YandexPublishing.c"
+						xmlNode* _tmp17_;
+						xmlNode* _tmp18_;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_tmp17_ = work;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_tmp18_ = _tmp17_->next;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						work = _tmp18_;
-#line 4368 "YandexPublishing.c"
+#line 4374 "YandexPublishing.c"
 					}
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp16_ = FALSE;
@@ -4376,7 +4382,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 					if (!(_tmp19_ != NULL)) {
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						break;
-#line 4378 "YandexPublishing.c"
+#line 4384 "YandexPublishing.c"
 					}
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp20_ = work;
@@ -4386,45 +4392,45 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 					if (g_strcmp0 (_tmp21_, "workspace") != 0) {
 #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						continue;
-#line 4388 "YandexPublishing.c"
+#line 4394 "YandexPublishing.c"
 					}
 					{
 						xmlNode* c = NULL;
-						xmlNode* _tmp22_ = NULL;
-						xmlNode* _tmp23_ = NULL;
+						xmlNode* _tmp22_;
+						xmlNode* _tmp23_;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_tmp22_ = work;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_tmp23_ = _tmp22_->children;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						c = _tmp23_;
-#line 4400 "YandexPublishing.c"
+#line 4406 "YandexPublishing.c"
 						{
 							gboolean _tmp24_ = FALSE;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 							_tmp24_ = TRUE;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 							while (TRUE) {
-#line 4407 "YandexPublishing.c"
-								xmlNode* _tmp27_ = NULL;
-								xmlNode* _tmp28_ = NULL;
-								const gchar* _tmp29_ = NULL;
-								xmlNode* _tmp30_ = NULL;
-								gchar* _tmp31_ = NULL;
-								gchar* _tmp32_ = NULL;
-								gboolean _tmp33_ = FALSE;
+#line 4413 "YandexPublishing.c"
+								xmlNode* _tmp27_;
+								xmlNode* _tmp28_;
+								const gchar* _tmp29_;
+								xmlNode* _tmp30_;
+								gchar* _tmp31_;
+								gchar* _tmp32_;
+								gboolean _tmp33_;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								if (!_tmp24_) {
-#line 4417 "YandexPublishing.c"
-									xmlNode* _tmp25_ = NULL;
-									xmlNode* _tmp26_ = NULL;
+#line 4423 "YandexPublishing.c"
+									xmlNode* _tmp25_;
+									xmlNode* _tmp26_;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									_tmp25_ = c;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									_tmp26_ = _tmp25_->next;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									c = _tmp26_;
-#line 4426 "YandexPublishing.c"
+#line 4432 "YandexPublishing.c"
 								}
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp24_ = FALSE;
@@ -4434,7 +4440,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 								if (!(_tmp27_ != NULL)) {
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									break;
-#line 4436 "YandexPublishing.c"
+#line 4442 "YandexPublishing.c"
 								}
 #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp28_ = c;
@@ -4444,7 +4450,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 								if (g_strcmp0 (_tmp29_, "collection") != 0) {
 #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									continue;
-#line 4446 "YandexPublishing.c"
+#line 4452 "YandexPublishing.c"
 								}
 #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp30_ = c;
@@ -4458,14 +4464,14 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 								_g_free0 (_tmp32_);
 #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								if (_tmp33_) {
-#line 4460 "YandexPublishing.c"
+#line 4466 "YandexPublishing.c"
 									gchar* url = NULL;
-									xmlNode* _tmp34_ = NULL;
-									gchar* _tmp35_ = NULL;
-									PublishingYandexSession* _tmp36_ = NULL;
-									gchar* _tmp37_ = NULL;
-									gchar* _tmp38_ = NULL;
-									const gchar* _tmp39_ = NULL;
+									xmlNode* _tmp34_;
+									gchar* _tmp35_;
+									PublishingYandexSession* _tmp36_;
+									gchar* _tmp37_;
+									gchar* _tmp38_;
+									const gchar* _tmp39_;
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									_tmp34_ = c;
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4490,7 +4496,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 									_g_free0 (url);
 #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									break;
-#line 4492 "YandexPublishing.c"
+#line 4498 "YandexPublishing.c"
 								}
 							}
 						}
@@ -4500,14 +4506,14 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		}
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 4502 "YandexPublishing.c"
+#line 4508 "YandexPublishing.c"
 	}
 	goto __finally46;
 	__catch46_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp40_ = NULL;
-		GError* _tmp41_ = NULL;
+		SpitPublishingPluginHost* _tmp40_;
+		GError* _tmp41_;
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4520,7 +4526,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		spit_publishing_plugin_host_post_error (_tmp40_, _tmp41_);
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4522 "YandexPublishing.c"
+#line 4528 "YandexPublishing.c"
 	}
 	__finally46:
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4531,17 +4537,17 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		g_clear_error (&_inner_error_);
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4533 "YandexPublishing.c"
+#line 4539 "YandexPublishing.c"
 	}
 }
 
 
 void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYandexYandexPublisher* self, const gchar* auth_token) {
-	PublishingYandexSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	PublishingYandexSession* _tmp0_;
+	const gchar* _tmp1_;
 	PublishingYandexTransaction* t = NULL;
-	PublishingYandexSession* _tmp2_ = NULL;
-	PublishingYandexTransaction* _tmp3_ = NULL;
+	PublishingYandexSession* _tmp2_;
+	PublishingYandexTransaction* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
@@ -4563,7 +4569,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self, 0);
 #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 4565 "YandexPublishing.c"
+#line 4571 "YandexPublishing.c"
 	{
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -4571,7 +4577,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4573 "YandexPublishing.c"
+#line 4579 "YandexPublishing.c"
 				goto __catch47_spit_publishing_publishing_error;
 			}
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4582,15 +4588,15 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 			g_clear_error (&_inner_error_);
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 4584 "YandexPublishing.c"
+#line 4590 "YandexPublishing.c"
 		}
 	}
 	goto __finally47;
 	__catch47_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp4_ = NULL;
-		GError* _tmp5_ = NULL;
+		SpitPublishingPluginHost* _tmp4_;
+		GError* _tmp5_;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		err = _inner_error_;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4603,7 +4609,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4605 "YandexPublishing.c"
+#line 4611 "YandexPublishing.c"
 	}
 	__finally47:
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4616,19 +4622,19 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 		g_clear_error (&_inner_error_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4618 "YandexPublishing.c"
+#line 4624 "YandexPublishing.c"
 	}
 #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
-#line 4622 "YandexPublishing.c"
+#line 4628 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_web_auth_login_succeeded (PublishingYandexYandexPublisher* self, const gchar* access_token) {
-	const gchar* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	SpitPublishingPluginHost* _tmp2_;
+	const gchar* _tmp3_;
 #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4649,7 +4655,7 @@ static void publishing_yandex_yandex_publisher_web_auth_login_succeeded (Publish
 	_tmp3_ = access_token;
 #line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp3_);
-#line 4651 "YandexPublishing.c"
+#line 4657 "YandexPublishing.c"
 }
 
 
@@ -4658,33 +4664,33 @@ static void publishing_yandex_yandex_publisher_web_auth_login_failed (Publishing
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_debug ("YandexPublishing.vala:595: login failed");
-#line 4660 "YandexPublishing.c"
+#line 4666 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded (PublishingYandexWebAuthPane* _sender, const gchar* success_url, gpointer self) {
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_web_auth_login_succeeded ((PublishingYandexYandexPublisher*) self, success_url);
-#line 4667 "YandexPublishing.c"
+#line 4673 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_web_auth_login_failed_publishing_yandex_web_auth_pane_login_failed (PublishingYandexWebAuthPane* _sender, gpointer self) {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_web_auth_login_failed ((PublishingYandexYandexPublisher*) self);
-#line 4674 "YandexPublishing.c"
+#line 4680 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexYandexPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	PublishingYandexWebAuthPane* _tmp3_ = NULL;
-	PublishingYandexWebAuthPane* _tmp4_ = NULL;
-	PublishingYandexWebAuthPane* _tmp5_ = NULL;
-	SpitPublishingPluginHost* _tmp6_ = NULL;
-	PublishingYandexWebAuthPane* _tmp7_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	PublishingYandexWebAuthPane* _tmp3_;
+	PublishingYandexWebAuthPane* _tmp4_;
+	PublishingYandexWebAuthPane* _tmp5_;
+	SpitPublishingPluginHost* _tmp6_;
+	PublishingYandexWebAuthPane* _tmp7_;
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4717,37 +4723,34 @@ static void publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexY
 	_tmp7_ = self->priv->web_auth_pane;
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_install_dialog_pane (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 4719 "YandexPublishing.c"
+#line 4725 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback (gpointer self) {
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_start_web_auth ((PublishingYandexYandexPublisher*) self);
-#line 4726 "YandexPublishing.c"
+#line 4732 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_show_welcome_page (PublishingYandexYandexPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp0_ = self->priv->host;
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp1_ = _ ("You are not currently logged into Yandex.Fotki.");
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, _tmp1_, _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback, self);
-#line 4741 "YandexPublishing.c"
+	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, _ ("You are not currently logged into Yandex.Fotki."), _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback, self);
+#line 4744 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublisher* base) {
 	PublishingYandexYandexPublisher * self;
-	gboolean _tmp0_ = FALSE;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp0_;
+	SpitPublishingPluginHost* _tmp1_;
+	gboolean _tmp2_;
 #line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
 #line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4756,7 +4759,7 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
 	if (_tmp0_) {
 #line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4758 "YandexPublishing.c"
+#line 4761 "YandexPublishing.c"
 	}
 #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = self->priv->host;
@@ -4765,7 +4768,7 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
 #line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_error ("YandexPublishing.vala:618: YandexPublisher: start( ): can't start; thi" \
 "s publisher is not restartable.");
-#line 4766 "YandexPublishing.c"
+#line 4769 "YandexPublishing.c"
 	}
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_debug ("YandexPublishing.vala:620: YandexPublisher: starting interaction.");
@@ -4775,12 +4778,12 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
 	_tmp2_ = publishing_yandex_yandex_publisher_is_persistent_session_available (self);
 #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (_tmp2_) {
-#line 4776 "YandexPublishing.c"
-		PublishingYandexSession* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+#line 4779 "YandexPublishing.c"
+		PublishingYandexSession* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp3_ = self->priv->session;
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4799,11 +4802,11 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
 		publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp7_);
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_free0 (_tmp7_);
-#line 4800 "YandexPublishing.c"
+#line 4803 "YandexPublishing.c"
 	} else {
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_show_welcome_page (self);
-#line 4804 "YandexPublishing.c"
+#line 4807 "YandexPublishing.c"
 	}
 }
 
@@ -4818,7 +4821,7 @@ static void publishing_yandex_yandex_publisher_real_stop (SpitPublishingPublishe
 	self->priv->host = NULL;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->running = FALSE;
-#line 4819 "YandexPublishing.c"
+#line 4822 "YandexPublishing.c"
 }
 
 
@@ -4829,7 +4832,7 @@ static void publishing_yandex_yandex_publisher_class_init (PublishingYandexYande
 	g_type_class_add_private (klass, sizeof (PublishingYandexYandexPublisherPrivate));
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_yandex_yandex_publisher_finalize;
-#line 4830 "YandexPublishing.c"
+#line 4833 "YandexPublishing.c"
 }
 
 
@@ -4837,14 +4840,14 @@ static void publishing_yandex_yandex_publisher_spit_publishing_publisher_interfa
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_is_running;
+	iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_yandex_yandex_publisher_real_is_running;
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_get_service;
+	iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_yandex_yandex_publisher_real_get_service;
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_start;
+	iface->start = (void (*) (SpitPublishingPublisher *)) publishing_yandex_yandex_publisher_real_start;
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_stop;
-#line 4845 "YandexPublishing.c"
+	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_yandex_yandex_publisher_real_stop;
+#line 4848 "YandexPublishing.c"
 }
 
 
@@ -4855,6 +4858,10 @@ static void publishing_yandex_yandex_publisher_instance_init (PublishingYandexYa
 	self->priv->host = NULL;
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->progress_reporter = NULL;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	self->priv->progress_reporter_target = self;
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->service = NULL;
 #line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4865,11 +4872,11 @@ static void publishing_yandex_yandex_publisher_instance_init (PublishingYandexYa
 	self->priv->running = FALSE;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->web_auth_pane = NULL;
-#line 4866 "YandexPublishing.c"
+#line 4873 "YandexPublishing.c"
 }
 
 
-static void publishing_yandex_yandex_publisher_finalize (GObject* obj) {
+static void publishing_yandex_yandex_publisher_finalize (GObject * obj) {
 	PublishingYandexYandexPublisher * self;
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
@@ -4893,7 +4900,7 @@ static void publishing_yandex_yandex_publisher_finalize (GObject* obj) {
 	_publishing_rest_support_session_unref0 (self->priv->session);
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (publishing_yandex_yandex_publisher_parent_class)->finalize (obj);
-#line 4894 "YandexPublishing.c"
+#line 4901 "YandexPublishing.c"
 }
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2017-11-12 15:55:20 +0100
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2017-11-12 15:55:20 +0100
commit	f6140ff1c9ec493d947da5b346508846e7a1a06f (patch)
tree	c01b9164ee4b0d46b6670ccee45f6181c6237d7f /plugins/shotwell-publishing-extras/YandexPublishing.c
parent	0f67b3cc674377559e66c5a6729fd499049a992f (diff)
parent	2492891f112caac6076ce49721d9d5d78a152c3a (diff)