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

4 files changed, 1654 insertions, 1632 deletions

diff --git a/plugins/common/BuilderPane.c b/plugins/common/BuilderPane.c
index 69bbe30..5797f7d 100644
--- a/plugins/common/BuilderPane.c
+++ b/plugins/common/BuilderPane.c
@@ -1,4 +1,4 @@
-/* BuilderPane.c generated by valac 0.34.7, the Vala compiler
+/* BuilderPane.c generated by valac 0.36.6, the Vala compiler
  * generated from BuilderPane.vala, do not modify */
 
 /* Copyright 2016 Jens Georg <mail@jensge.org>
@@ -51,16 +51,16 @@ struct _ShotwellPluginsCommonBuilderPanePrivate {
 
 
 static gpointer shotwell_plugins_common_builder_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 
 GType shotwell_plugins_common_builder_pane_get_type (void) G_GNUC_CONST;
 #define SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPanePrivate))
 enum  {
 	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DUMMY_PROPERTY,
-	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY,
-	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH,
-	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS,
-	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID
+	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY,
+	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY,
+	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY,
+	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY
 };
 static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base);
 gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCommonBuilderPane* self);
@@ -81,7 +81,7 @@ static void shotwell_plugins_common_builder_pane_set_preferred_geometry (Shotwel
 static void shotwell_plugins_common_builder_pane_set_resource_path (ShotwellPluginsCommonBuilderPane* self, const gchar* value);
 static void shotwell_plugins_common_builder_pane_set_connect_signals (ShotwellPluginsCommonBuilderPane* self, gboolean value);
 static void shotwell_plugins_common_builder_pane_set_default_id (ShotwellPluginsCommonBuilderPane* self, const gchar* value);
-static void shotwell_plugins_common_builder_pane_finalize (GObject* obj);
+static void shotwell_plugins_common_builder_pane_finalize (GObject * obj);
 static void _vala_shotwell_plugins_common_builder_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_shotwell_plugins_common_builder_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 
@@ -95,20 +95,20 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base) {
 	ShotwellPluginsCommonBuilderPane * self;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	GtkBuilder* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	GtkBuilder* _tmp9_ = NULL;
-	GObject* _tmp10_ = NULL;
-	GtkWidget* _tmp11_ = NULL;
-	GtkWidget* _tmp12_ = NULL;
-	GtkContainer* _tmp13_ = NULL;
-	GtkContainer* _tmp14_ = NULL;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	GtkBuilder* _tmp6_;
+	gboolean _tmp7_;
+	GtkBuilder* _tmp9_;
+	GObject* _tmp10_;
+	GtkWidget* _tmp11_;
+	GtkWidget* _tmp12_;
+	GtkContainer* _tmp13_;
+	GtkContainer* _tmp14_;
 #line 22 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
 #line 23 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -142,7 +142,7 @@ static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base
 #line 28 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	if (_tmp7_) {
 #line 145 "BuilderPane.c"
-		GtkBuilder* _tmp8_ = NULL;
+		GtkBuilder* _tmp8_;
 #line 29 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		_tmp8_ = self->priv->builder;
 #line 29 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -168,10 +168,10 @@ static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base
 #line 35 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	if (_tmp14_ != NULL) {
 #line 171 "BuilderPane.c"
-		GtkWidget* _tmp15_ = NULL;
-		GtkContainer* _tmp16_ = NULL;
-		GtkContainer* _tmp17_ = NULL;
-		GtkWidget* _tmp18_ = NULL;
+		GtkWidget* _tmp15_;
+		GtkContainer* _tmp16_;
+		GtkContainer* _tmp17_;
+		GtkWidget* _tmp18_;
 #line 36 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		_tmp15_ = self->priv->content;
 #line 36 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -190,7 +190,7 @@ static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base
 static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	ShotwellPluginsCommonBuilderPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-	SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
+	SpitPublishingDialogPaneGeometryOptions _tmp0_;
 #line 40 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
 #line 41 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -206,8 +206,8 @@ static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_p
 static GtkWidget* shotwell_plugins_common_builder_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	ShotwellPluginsCommonBuilderPane * self;
 	GtkWidget* result = NULL;
-	GtkWidget* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkWidget* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 44 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
 #line 45 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -224,8 +224,8 @@ static GtkWidget* shotwell_plugins_common_builder_pane_real_get_widget (SpitPubl
 
 GtkBuilder* shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCommonBuilderPane* self) {
 	GtkBuilder* result = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GtkBuilder* _tmp1_ = NULL;
+	GtkBuilder* _tmp0_;
+	GtkBuilder* _tmp1_;
 #line 48 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), NULL);
 #line 49 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -242,14 +242,14 @@ GtkBuilder* shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCom
 
 static GtkWidget* shotwell_plugins_common_builder_pane_real_get_default_widget (ShotwellPluginsCommonBuilderPane* self) {
 	GtkWidget* result = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GtkBuilder* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	GObject* _tmp5_ = NULL;
-	GtkWidget* _tmp6_ = NULL;
-	GtkWidget* _tmp7_ = NULL;
+	GtkBuilder* _tmp0_;
+	GtkBuilder* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GObject* _tmp5_;
+	GtkWidget* _tmp6_;
+	GtkWidget* _tmp7_;
 #line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	_tmp0_ = shotwell_plugins_common_builder_pane_get_builder (self);
 #line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -325,7 +325,7 @@ ShotwellPluginsCommonBuilderPane* shotwell_plugins_common_builder_pane_construct
 
 SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_get_preferred_geometry (ShotwellPluginsCommonBuilderPane* self) {
 	SpitPublishingDialogPaneGeometryOptions result;
-	SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
+	SpitPublishingDialogPaneGeometryOptions _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), 0);
 #line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -339,23 +339,27 @@ SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_get
 
 
 static void shotwell_plugins_common_builder_pane_set_preferred_geometry (ShotwellPluginsCommonBuilderPane* self, SpitPublishingDialogPaneGeometryOptions value) {
-	SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
 #line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
 #line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	_tmp0_ = value;
+	if (shotwell_plugins_common_builder_pane_get_preferred_geometry (self) != value) {
+#line 347 "BuilderPane.c"
+		SpitPublishingDialogPaneGeometryOptions _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	self->priv->_preferred_geometry = _tmp0_;
+		_tmp0_ = value;
 #line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	g_object_notify ((GObject *) self, "preferred-geometry");
-#line 352 "BuilderPane.c"
+		self->priv->_preferred_geometry = _tmp0_;
+#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		g_object_notify ((GObject *) self, "preferred-geometry");
+#line 355 "BuilderPane.c"
+	}
 }
 
 
 gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCommonBuilderPane* self) {
 	gchar* result;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), NULL);
 #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -366,32 +370,36 @@ gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCo
 	result = _tmp1_;
 #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	return result;
-#line 370 "BuilderPane.c"
+#line 374 "BuilderPane.c"
 }
 
 
 static void shotwell_plugins_common_builder_pane_set_resource_path (ShotwellPluginsCommonBuilderPane* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
 #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
 #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	_tmp0_ = value;
+	if (g_strcmp0 (value, shotwell_plugins_common_builder_pane_get_resource_path (self)) != 0) {
+#line 383 "BuilderPane.c"
+		const gchar* _tmp0_;
+		gchar* _tmp1_;
 #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+		_tmp0_ = value;
 #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	_g_free0 (self->priv->_resource_path);
+		_tmp1_ = g_strdup (_tmp0_);
 #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	self->priv->_resource_path = _tmp1_;
+		_g_free0 (self->priv->_resource_path);
 #line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	g_object_notify ((GObject *) self, "resource-path");
-#line 389 "BuilderPane.c"
+		self->priv->_resource_path = _tmp1_;
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		g_object_notify ((GObject *) self, "resource-path");
+#line 396 "BuilderPane.c"
+	}
 }
 
 
 gboolean shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPluginsCommonBuilderPane* self) {
 	gboolean result;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), FALSE);
 #line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -400,28 +408,32 @@ gboolean shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPlugi
 	result = _tmp0_;
 #line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	return result;
-#line 404 "BuilderPane.c"
+#line 412 "BuilderPane.c"
 }
 
 
 static void shotwell_plugins_common_builder_pane_set_connect_signals (ShotwellPluginsCommonBuilderPane* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
 #line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
 #line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	_tmp0_ = value;
+	if (shotwell_plugins_common_builder_pane_get_connect_signals (self) != value) {
+#line 421 "BuilderPane.c"
+		gboolean _tmp0_;
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		_tmp0_ = value;
 #line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	self->priv->_connect_signals = _tmp0_;
+		self->priv->_connect_signals = _tmp0_;
 #line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	g_object_notify ((GObject *) self, "connect-signals");
-#line 418 "BuilderPane.c"
+		g_object_notify ((GObject *) self, "connect-signals");
+#line 429 "BuilderPane.c"
+	}
 }
 
 
 gchar* shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommonBuilderPane* self) {
 	gchar* result;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), NULL);
 #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -432,26 +444,30 @@ gchar* shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommo
 	result = _tmp1_;
 #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	return result;
-#line 436 "BuilderPane.c"
+#line 448 "BuilderPane.c"
 }
 
 
 static void shotwell_plugins_common_builder_pane_set_default_id (ShotwellPluginsCommonBuilderPane* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
 #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
 #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	_tmp0_ = value;
+	if (g_strcmp0 (value, shotwell_plugins_common_builder_pane_get_default_id (self)) != 0) {
+#line 457 "BuilderPane.c"
+		const gchar* _tmp0_;
+		gchar* _tmp1_;
 #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+		_tmp0_ = value;
 #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	_g_free0 (self->priv->_default_id);
+		_tmp1_ = g_strdup (_tmp0_);
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		_g_free0 (self->priv->_default_id);
 #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	self->priv->_default_id = _tmp1_;
+		self->priv->_default_id = _tmp1_;
 #line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	g_object_notify ((GObject *) self, "default-id");
-#line 455 "BuilderPane.c"
+		g_object_notify ((GObject *) self, "default-id");
+#line 470 "BuilderPane.c"
+	}
 }
 
 
@@ -461,13 +477,13 @@ static void shotwell_plugins_common_builder_pane_class_init (ShotwellPluginsComm
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	g_type_class_add_private (klass, sizeof (ShotwellPluginsCommonBuilderPanePrivate));
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	((GObjectClass *) klass)->constructed = (void (*)(GObject*)) shotwell_plugins_common_builder_pane_real_constructed;
+	((GObjectClass *) klass)->constructed = (void (*) (GObject *)) shotwell_plugins_common_builder_pane_real_constructed;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	((ShotwellPluginsCommonBuilderPaneClass *) klass)->get_default_widget = (GtkWidget* (*)(ShotwellPluginsCommonBuilderPane*)) shotwell_plugins_common_builder_pane_real_get_default_widget;
+	((ShotwellPluginsCommonBuilderPaneClass *) klass)->get_default_widget = (GtkWidget* (*) (ShotwellPluginsCommonBuilderPane *)) shotwell_plugins_common_builder_pane_real_get_default_widget;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = (void (*)(ShotwellPluginsCommonBuilderPane*)) shotwell_plugins_common_builder_pane_real_on_pane_installed;
+	((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = (void (*) (ShotwellPluginsCommonBuilderPane *)) shotwell_plugins_common_builder_pane_real_on_pane_installed;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_uninstalled = (void (*)(ShotwellPluginsCommonBuilderPane*)) shotwell_plugins_common_builder_pane_real_on_pane_uninstalled;
+	((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_uninstalled = (void (*) (ShotwellPluginsCommonBuilderPane *)) shotwell_plugins_common_builder_pane_real_on_pane_uninstalled;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_shotwell_plugins_common_builder_pane_get_property;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -475,14 +491,14 @@ static void shotwell_plugins_common_builder_pane_class_init (ShotwellPluginsComm
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	G_OBJECT_CLASS (klass)->finalize = shotwell_plugins_common_builder_pane_finalize;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY, g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY, g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH, g_param_spec_string ("resource-path", "resource-path", "resource-path", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY, g_param_spec_string ("resource-path", "resource-path", "resource-path", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS, g_param_spec_boolean ("connect-signals", "connect-signals", "connect-signals", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY, g_param_spec_boolean ("connect-signals", "connect-signals", "connect-signals", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID, g_param_spec_string ("default-id", "default-id", "default-id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-#line 486 "BuilderPane.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY, g_param_spec_string ("default-id", "default-id", "default-id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 502 "BuilderPane.c"
 }
 
 
@@ -490,19 +506,19 @@ static void shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_int
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_builder_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_builder_pane_real_get_preferred_geometry;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_builder_pane_real_get_widget;
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_builder_pane_real_get_widget;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_builder_pane_on_pane_installed;
+	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_builder_pane_on_pane_installed;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_builder_pane_on_pane_uninstalled;
-#line 501 "BuilderPane.c"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_builder_pane_on_pane_uninstalled;
+#line 517 "BuilderPane.c"
 }
 
 
 static void shotwell_plugins_common_builder_pane_instance_init (ShotwellPluginsCommonBuilderPane * self) {
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	self->priv = SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_PRIVATE (self);
 #line 10 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
@@ -513,11 +529,11 @@ static void shotwell_plugins_common_builder_pane_instance_init (ShotwellPluginsC
 	_tmp0_ = g_strdup ("default");
 #line 15 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	self->priv->_default_id = _tmp0_;
-#line 517 "BuilderPane.c"
+#line 533 "BuilderPane.c"
 }
 
 
-static void shotwell_plugins_common_builder_pane_finalize (GObject* obj) {
+static void shotwell_plugins_common_builder_pane_finalize (GObject * obj) {
 	ShotwellPluginsCommonBuilderPane * self;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
@@ -531,7 +547,7 @@ static void shotwell_plugins_common_builder_pane_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->content);
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	G_OBJECT_CLASS (shotwell_plugins_common_builder_pane_parent_class)->finalize (obj);
-#line 535 "BuilderPane.c"
+#line 551 "BuilderPane.c"
 }
 
 
@@ -555,36 +571,36 @@ static void _vala_shotwell_plugins_common_builder_pane_get_property (GObject * o
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	switch (property_id) {
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY:
+		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY:
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		g_value_set_enum (value, shotwell_plugins_common_builder_pane_get_preferred_geometry (self));
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		break;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH:
+		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY:
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		g_value_take_string (value, shotwell_plugins_common_builder_pane_get_resource_path (self));
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		break;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS:
+		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY:
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		g_value_set_boolean (value, shotwell_plugins_common_builder_pane_get_connect_signals (self));
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		break;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID:
+		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY:
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		g_value_take_string (value, shotwell_plugins_common_builder_pane_get_default_id (self));
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		break;
-#line 582 "BuilderPane.c"
+#line 598 "BuilderPane.c"
 		default:
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		break;
-#line 588 "BuilderPane.c"
+#line 604 "BuilderPane.c"
 	}
 }
 
@@ -595,36 +611,36 @@ static void _vala_shotwell_plugins_common_builder_pane_set_property (GObject * o
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 	switch (property_id) {
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY:
+		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY_PROPERTY:
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		shotwell_plugins_common_builder_pane_set_preferred_geometry (self, g_value_get_enum (value));
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		break;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH:
+		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH_PROPERTY:
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		shotwell_plugins_common_builder_pane_set_resource_path (self, g_value_get_string (value));
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		break;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS:
+		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS_PROPERTY:
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		shotwell_plugins_common_builder_pane_set_connect_signals (self, g_value_get_boolean (value));
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		break;
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
-		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID:
+		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID_PROPERTY:
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		shotwell_plugins_common_builder_pane_set_default_id (self, g_value_get_string (value));
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		break;
-#line 622 "BuilderPane.c"
+#line 638 "BuilderPane.c"
 		default:
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
 		break;
-#line 628 "BuilderPane.c"
+#line 644 "BuilderPane.c"
 	}
 }
 
diff --git a/plugins/common/RESTSupport.c b/plugins/common/RESTSupport.c
index 5a5d29f..f30430a 100644
--- a/plugins/common/RESTSupport.c
+++ b/plugins/common/RESTSupport.c
@@ -1,4 +1,4 @@
-/* RESTSupport.c generated by valac 0.34.7, the Vala compiler
+/* RESTSupport.c generated by valac 0.36.6, the Vala compiler
  * generated from RESTSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -38,6 +38,13 @@ typedef struct _PublishingRESTSupportSessionPrivate PublishingRESTSupportSession
 #define _g_free0(var) (var = (g_free (var), NULL))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 typedef struct _PublishingRESTSupportParamSpecSession PublishingRESTSupportParamSpecSession;
+enum  {
+	PUBLISHING_REST_SUPPORT_SESSION_WIRE_MESSAGE_UNQUEUED_SIGNAL,
+	PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATED_SIGNAL,
+	PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATION_FAILED_SIGNAL,
+	PUBLISHING_REST_SUPPORT_SESSION_LAST_SIGNAL
+};
+static guint publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_LAST_SIGNAL] = {0};
 
 #define PUBLISHING_REST_SUPPORT_TYPE_HTTP_METHOD (publishing_rest_support_http_method_get_type ())
 
@@ -68,6 +75,13 @@ typedef struct _PublishingRESTSupportTransactionPrivate PublishingRESTSupportTra
 #define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
 #define __vala_SoupURI_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupURI_free (var), NULL)))
 typedef struct _PublishingRESTSupportParamSpecTransaction PublishingRESTSupportParamSpecTransaction;
+enum  {
+	PUBLISHING_REST_SUPPORT_TRANSACTION_CHUNK_TRANSMITTED_SIGNAL,
+	PUBLISHING_REST_SUPPORT_TRANSACTION_NETWORK_ERROR_SIGNAL,
+	PUBLISHING_REST_SUPPORT_TRANSACTION_COMPLETED_SIGNAL,
+	PUBLISHING_REST_SUPPORT_TRANSACTION_LAST_SIGNAL
+};
+static guint publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_LAST_SIGNAL] = {0};
 
 #define PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION (publishing_rest_support_upload_transaction_get_type ())
 #define PUBLISHING_REST_SUPPORT_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction))
@@ -109,6 +123,12 @@ typedef struct _PublishingRESTSupportBatchUploaderPrivate PublishingRESTSupportB
 #define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
 #define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL)))
 typedef struct _PublishingRESTSupportParamSpecBatchUploader PublishingRESTSupportParamSpecBatchUploader;
+enum  {
+	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_COMPLETE_SIGNAL,
+	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_ERROR_SIGNAL,
+	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_LAST_SIGNAL
+};
+static guint publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_LAST_SIGNAL] = {0};
 
 #define PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION (publishing_rest_support_google_session_get_type ())
 #define PUBLISHING_REST_SUPPORT_GOOGLE_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession))
@@ -360,7 +380,7 @@ static gpointer publishing_rest_support_google_session_parent_class = NULL;
 static gpointer publishing_rest_support_google_publisher_parent_class = NULL;
 static gpointer publishing_rest_support_google_publisher_google_session_impl_parent_class = NULL;
 static gpointer publishing_rest_support_google_publisher_authenticated_transaction_parent_class = NULL;
-static SpitPublishingPublisherIface* publishing_rest_support_google_publisher_spit_publishing_publisher_parent_iface = NULL;
+static SpitPublishingPublisherIface * publishing_rest_support_google_publisher_spit_publishing_publisher_parent_iface = NULL;
 
 #define PUBLISHING_REST_SUPPORT_SHA1_HMAC_LENGTH 20
 gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message);
@@ -387,7 +407,7 @@ gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRES
 void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self, SoupMessage* message);
 static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self);
 void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self);
-static void publishing_rest_support_session_finalize (PublishingRESTSupportSession* obj);
+static void publishing_rest_support_session_finalize (PublishingRESTSupportSession * obj);
 GType publishing_rest_support_http_method_get_type (void) G_GNUC_CONST;
 gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpMethod self);
 PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string (const gchar* str);
@@ -407,7 +427,7 @@ gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* ar
 PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray, int inputArray_length1, int* result_length1);
 static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
 gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self);
-static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgument* obj);
+static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgument * obj);
 gpointer publishing_rest_support_transaction_ref (gpointer instance);
 void publishing_rest_support_transaction_unref (gpointer instance);
 GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -428,7 +448,7 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_
 static void publishing_rest_support_transaction_on_message_unqueued (PublishingRESTSupportTransaction* self, SoupMessage* message);
 void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self, SoupMessage* message, GError** error);
 gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTransaction* self);
-gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate** cert);
+gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate* * cert);
 gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSupportTransaction* self);
 PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self, int* result_length1);
 static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportArgument** self, int length);
@@ -449,10 +469,10 @@ static void _vala_SoupURI_free (SoupURI* self);
 SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (PublishingRESTSupportTransaction* self);
 SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupportTransaction* self);
 void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self, const gchar* name, const gchar* value);
-static void _vala_array_add1 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value);
+static void _vala_array_add1 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value);
 PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_session (PublishingRESTSupportTransaction* self);
 static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void publishing_rest_support_transaction_finalize (PublishingRESTSupportTransaction* obj);
+static void publishing_rest_support_transaction_finalize (PublishingRESTSupportTransaction * obj);
 GType publishing_rest_support_upload_transaction_get_type (void) G_GNUC_CONST;
 enum  {
 	PUBLISHING_REST_SUPPORT_UPLOAD_TRANSACTION_DUMMY_PROPERTY
@@ -470,7 +490,7 @@ void publishing_rest_support_upload_transaction_set_binary_disposition_table (Pu
 static void publishing_rest_support_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
 static void _vala_SoupMultipart_free (SoupMultipart* self);
 static void _vala_SoupBuffer_free (SoupBuffer* self);
-static void publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction* obj);
+static void publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction * obj);
 gpointer publishing_rest_support_xml_document_ref (gpointer instance);
 void publishing_rest_support_xml_document_unref (gpointer instance);
 GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -488,7 +508,7 @@ xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSuppo
 xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSupportXmlDocument* self, xmlNode* parent, const gchar* child_name, GError** error);
 gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSupportXmlDocument* self, xmlNode* node, const gchar* property_key, GError** error);
 PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_string (const gchar* input_string, PublishingRESTSupportXmlDocumentCheckForErrorResponse check_for_error_response, void* check_for_error_response_target, GError** error);
-static void publishing_rest_support_xml_document_finalize (PublishingRESTSupportXmlDocument* obj);
+static void publishing_rest_support_xml_document_finalize (PublishingRESTSupportXmlDocument * obj);
 gchar* publishing_rest_support_decimal_entity_encode (const gchar* source);
 gpointer publishing_rest_support_batch_uploader_ref (gpointer instance);
 void publishing_rest_support_batch_uploader_unref (gpointer instance);
@@ -511,7 +531,7 @@ PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session
 SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_publishable (PublishingRESTSupportBatchUploader* self);
 static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable);
 void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUploader* self, SpitPublishingProgressCallback status_updated, void* status_updated_target);
-static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSupportBatchUploader* obj);
+static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSupportBatchUploader * obj);
 gchar* publishing_rest_support_asciify_string (const gchar* s);
 GType publishing_rest_support_google_session_get_type (void) G_GNUC_CONST;
 enum  {
@@ -560,7 +580,7 @@ static gboolean publishing_rest_support_google_publisher_google_session_impl_rea
 static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_user_name (PublishingRESTSupportGoogleSession* base);
 static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_access_token (PublishingRESTSupportGoogleSession* base);
 static void publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate (PublishingRESTSupportGoogleSession* base);
-static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession* obj);
+static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession * obj);
 GType publishing_rest_support_google_publisher_authenticated_transaction_get_type (void) G_GNUC_CONST;
 enum  {
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_AUTHENTICATED_TRANSACTION_DUMMY_PROPERTY
@@ -569,7 +589,7 @@ static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_
 static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
 PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
 PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
-static void publishing_rest_support_google_publisher_finalize (GObject* obj);
+static void publishing_rest_support_google_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);
 
@@ -577,50 +597,50 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 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 617 "RESTSupport.c"
+#line 637 "RESTSupport.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 623 "RESTSupport.c"
+#line 643 "RESTSupport.c"
 }
 
 
@@ -629,19 +649,19 @@ gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message
 	guint8 buffer[PUBLISHING_REST_SUPPORT_SHA1_HMAC_LENGTH] = {0};
 	gsize len = 0UL;
 	GHmac* mac = NULL;
-	const gchar* _tmp0_ = NULL;
-	guint8* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	guint8* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	GHmac* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	guint8* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	guint8* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	gsize _tmp7_ = 0UL;
-	gchar* _tmp8_ = NULL;
+	const gchar* _tmp0_;
+	guint8* _tmp1_;
+	gint _tmp1__length1;
+	guint8* _tmp2_;
+	gint _tmp2__length1;
+	GHmac* _tmp3_;
+	const gchar* _tmp4_;
+	guint8* _tmp5_;
+	gint _tmp5__length1;
+	guint8* _tmp6_;
+	gint _tmp6__length1;
+	gsize _tmp7_;
+	gchar* _tmp8_;
 #line 14 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (key != NULL, NULL);
 #line 14 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -682,16 +702,16 @@ gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message
 	_g_hmac_unref0 (mac);
 #line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 685 "RESTSupport.c"
+#line 705 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportSession* publishing_rest_support_session_construct (GType object_type, const gchar* endpoint_url) {
 	PublishingRESTSupportSession* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	SoupSession* _tmp2_ = NULL;
-	SoupSession* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	SoupSession* _tmp2_;
+	SoupSession* _tmp3_;
 #line 34 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportSession*) g_type_create_instance (object_type);
 #line 35 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -714,12 +734,12 @@ PublishingRESTSupportSession* publishing_rest_support_session_construct (GType o
 	g_object_set (_tmp3_, "ssl-use-system-ca-file", TRUE, NULL);
 #line 34 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 717 "RESTSupport.c"
+#line 737 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRESTSupportSession* self, SoupMessage* message) {
-	SoupMessage* _tmp0_ = NULL;
+	SoupMessage* _tmp0_;
 #line 40 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
 #line 40 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -727,8 +747,8 @@ void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRES
 #line 41 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = message;
 #line 41 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_emit_by_name (self, "wire-message-unqueued", _tmp0_);
-#line 731 "RESTSupport.c"
+	g_signal_emit (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_WIRE_MESSAGE_UNQUEUED_SIGNAL], 0, _tmp0_);
+#line 751 "RESTSupport.c"
 }
 
 
@@ -736,20 +756,20 @@ void publishing_rest_support_session_notify_authenticated (PublishingRESTSupport
 #line 44 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
 #line 45 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_emit_by_name (self, "authenticated");
-#line 740 "RESTSupport.c"
+	g_signal_emit (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATED_SIGNAL], 0);
+#line 760 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_session_notify_authentication_failed (PublishingRESTSupportSession* self, GError* err) {
-	GError* _tmp0_ = NULL;
+	GError* _tmp0_;
 #line 48 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
 #line 49 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = err;
 #line 49 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_emit_by_name (self, "authentication-failed", _tmp0_);
-#line 752 "RESTSupport.c"
+	g_signal_emit (self, publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATION_FAILED_SIGNAL], 0, _tmp0_);
+#line 772 "RESTSupport.c"
 }
 
 
@@ -759,7 +779,7 @@ static gboolean publishing_rest_support_session_real_is_authenticated (Publishin
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_session_is_authenticated'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return _tmp0_;
-#line 762 "RESTSupport.c"
+#line 782 "RESTSupport.c"
 }
 
 
@@ -768,14 +788,14 @@ gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupport
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self), FALSE);
 #line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->is_authenticated (self);
-#line 771 "RESTSupport.c"
+#line 791 "RESTSupport.c"
 }
 
 
 gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSession* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 54 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self), NULL);
 #line 55 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -786,12 +806,12 @@ gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSe
 	result = _tmp1_;
 #line 55 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 789 "RESTSupport.c"
+#line 809 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSession* self) {
-	SoupSession* _tmp0_ = NULL;
+	SoupSession* _tmp0_;
 #line 58 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
 #line 59 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -800,13 +820,13 @@ void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSes
 	_tmp0_ = self->priv->soup_session;
 #line 60 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	soup_session_abort (_tmp0_);
-#line 803 "RESTSupport.c"
+#line 823 "RESTSupport.c"
 }
 
 
 gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRESTSupportSession* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 63 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self), FALSE);
 #line 64 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -815,24 +835,24 @@ gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRES
 	result = _tmp0_;
 #line 64 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 818 "RESTSupport.c"
+#line 838 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) {
 #line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_session_notify_wire_message_unqueued ((PublishingRESTSupportSession*) self, msg);
-#line 825 "RESTSupport.c"
+#line 845 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self, SoupMessage* message) {
-	gboolean _tmp0_ = FALSE;
-	SoupSession* _tmp1_ = NULL;
-	SoupSession* _tmp2_ = NULL;
-	SoupMessage* _tmp3_ = NULL;
-	SoupSession* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
+	gboolean _tmp0_;
+	SoupSession* _tmp1_;
+	SoupSession* _tmp2_;
+	SoupMessage* _tmp3_;
+	SoupSession* _tmp4_;
+	guint _tmp5_;
 #line 67 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
 #line 67 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -843,7 +863,7 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes
 	if (_tmp0_) {
 #line 69 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 846 "RESTSupport.c"
+#line 866 "RESTSupport.c"
 	}
 #line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->soup_session;
@@ -861,13 +881,13 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes
 	g_signal_parse_name ("request-unqueued", soup_session_get_type (), &_tmp5_, NULL, FALSE);
 #line 74 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued, self);
-#line 864 "RESTSupport.c"
+#line 884 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self) {
-	SoupSession* _tmp0_ = NULL;
-	SoupSession* _tmp1_ = NULL;
+	SoupSession* _tmp0_;
+	SoupSession* _tmp1_;
 #line 77 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
 #line 78 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -878,14 +898,14 @@ void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession*
 	_tmp1_ = self->priv->soup_session;
 #line 79 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_object_set (_tmp1_, "ssl-strict", FALSE, NULL);
-#line 881 "RESTSupport.c"
+#line 901 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_session_init (GValue* value) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 888 "RESTSupport.c"
+#line 908 "RESTSupport.c"
 }
 
 
@@ -894,7 +914,7 @@ static void publishing_rest_support_value_session_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_session_unref (value->data[0].v_pointer);
-#line 897 "RESTSupport.c"
+#line 917 "RESTSupport.c"
 	}
 }
 
@@ -904,11 +924,11 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_
 	if (src_value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_session_ref (src_value->data[0].v_pointer);
-#line 907 "RESTSupport.c"
+#line 927 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 911 "RESTSupport.c"
+#line 931 "RESTSupport.c"
 	}
 }
 
@@ -916,66 +936,66 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_
 static gpointer publishing_rest_support_value_session_peek_pointer (const GValue* value) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 919 "RESTSupport.c"
+#line 939 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 926 "RESTSupport.c"
-		PublishingRESTSupportSession* object;
+#line 946 "RESTSupport.c"
+		PublishingRESTSupportSession * object;
 		object = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 933 "RESTSupport.c"
+#line 953 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 937 "RESTSupport.c"
+#line 957 "RESTSupport.c"
 		}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_session_ref (object);
-#line 941 "RESTSupport.c"
+#line 961 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 945 "RESTSupport.c"
+#line 965 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 949 "RESTSupport.c"
+#line 969 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_session_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingRESTSupportSession** object_p;
+	PublishingRESTSupportSession ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!object_p) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 960 "RESTSupport.c"
+#line 980 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 966 "RESTSupport.c"
+#line 986 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 970 "RESTSupport.c"
+#line 990 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_session_ref (value->data[0].v_pointer);
-#line 974 "RESTSupport.c"
+#line 994 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 978 "RESTSupport.c"
+#line 998 "RESTSupport.c"
 }
 
 
@@ -989,7 +1009,7 @@ GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 992 "RESTSupport.c"
+#line 1012 "RESTSupport.c"
 }
 
 
@@ -998,12 +1018,12 @@ gpointer publishing_rest_support_value_get_session (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION), NULL);
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 1001 "RESTSupport.c"
+#line 1021 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_value_set_session (GValue* value, gpointer v_object) {
-	PublishingRESTSupportSession* old;
+	PublishingRESTSupportSession * old;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION));
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1018,23 +1038,23 @@ void publishing_rest_support_value_set_session (GValue* value, gpointer v_object
 		value->data[0].v_pointer = v_object;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_session_ref (value->data[0].v_pointer);
-#line 1021 "RESTSupport.c"
+#line 1041 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1025 "RESTSupport.c"
+#line 1045 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_session_unref (old);
-#line 1031 "RESTSupport.c"
+#line 1051 "RESTSupport.c"
 	}
 }
 
 
 void publishing_rest_support_value_take_session (GValue* value, gpointer v_object) {
-	PublishingRESTSupportSession* old;
+	PublishingRESTSupportSession * old;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION));
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1047,17 +1067,17 @@ void publishing_rest_support_value_take_session (GValue* value, gpointer v_objec
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 1050 "RESTSupport.c"
+#line 1070 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1054 "RESTSupport.c"
+#line 1074 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_session_unref (old);
-#line 1060 "RESTSupport.c"
+#line 1080 "RESTSupport.c"
 	}
 }
 
@@ -1070,14 +1090,14 @@ static void publishing_rest_support_session_class_init (PublishingRESTSupportSes
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRESTSupportSessionPrivate));
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_rest_support_session_real_is_authenticated;
+	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_rest_support_session_real_is_authenticated;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_new ("wire_message_unqueued", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, soup_message_get_type ());
+	publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_WIRE_MESSAGE_UNQUEUED_SIGNAL] = g_signal_new ("wire-message-unqueued", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, soup_message_get_type ());
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_new ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+	publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATED_SIGNAL] = g_signal_new ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_new ("authentication_failed", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 1080 "RESTSupport.c"
+	publishing_rest_support_session_signals[PUBLISHING_REST_SUPPORT_SESSION_AUTHENTICATION_FAILED_SIGNAL] = g_signal_new ("authentication-failed", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
+#line 1100 "RESTSupport.c"
 }
 
 
@@ -1092,11 +1112,11 @@ static void publishing_rest_support_session_instance_init (PublishingRESTSupport
 	self->priv->transactions_stopped = FALSE;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 1095 "RESTSupport.c"
+#line 1115 "RESTSupport.c"
 }
 
 
-static void publishing_rest_support_session_finalize (PublishingRESTSupportSession* obj) {
+static void publishing_rest_support_session_finalize (PublishingRESTSupportSession * obj) {
 	PublishingRESTSupportSession * self;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession);
@@ -1106,7 +1126,7 @@ static void publishing_rest_support_session_finalize (PublishingRESTSupportSessi
 	_g_free0 (self->priv->endpoint_url);
 #line 27 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->soup_session);
-#line 1109 "RESTSupport.c"
+#line 1129 "RESTSupport.c"
 }
 
 
@@ -1125,18 +1145,18 @@ GType publishing_rest_support_session_get_type (void) {
 
 
 gpointer publishing_rest_support_session_ref (gpointer instance) {
-	PublishingRESTSupportSession* self;
+	PublishingRESTSupportSession * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 1134 "RESTSupport.c"
+#line 1154 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_session_unref (gpointer instance) {
-	PublishingRESTSupportSession* self;
+	PublishingRESTSupportSession * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1144,7 +1164,7 @@ void publishing_rest_support_session_unref (gpointer instance) {
 		PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->finalize (self);
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1147 "RESTSupport.c"
+#line 1167 "RESTSupport.c"
 	}
 }
 
@@ -1155,48 +1175,48 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
 	switch (self) {
 #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET:
-#line 1158 "RESTSupport.c"
+#line 1178 "RESTSupport.c"
 		{
-			gchar* _tmp0_ = NULL;
+			gchar* _tmp0_;
 #line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp0_ = g_strdup ("GET");
 #line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			result = _tmp0_;
 #line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 1167 "RESTSupport.c"
+#line 1187 "RESTSupport.c"
 		}
 #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT:
-#line 1171 "RESTSupport.c"
+#line 1191 "RESTSupport.c"
 		{
-			gchar* _tmp1_ = NULL;
+			gchar* _tmp1_;
 #line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp1_ = g_strdup ("PUT");
 #line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			result = _tmp1_;
 #line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 1180 "RESTSupport.c"
+#line 1200 "RESTSupport.c"
 		}
 #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST:
-#line 1184 "RESTSupport.c"
+#line 1204 "RESTSupport.c"
 		{
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 #line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp2_ = g_strdup ("POST");
 #line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			result = _tmp2_;
 #line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 1193 "RESTSupport.c"
+#line 1213 "RESTSupport.c"
 		}
 		default:
 		{
 #line 100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_error ("RESTSupport.vala:100: unrecognized HTTP method enumeration value");
-#line 1199 "RESTSupport.c"
+#line 1219 "RESTSupport.c"
 		}
 	}
 }
@@ -1204,7 +1224,7 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
 
 PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string (const gchar* str) {
 	PublishingRESTSupportHttpMethod result = 0;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 104 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 105 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1215,9 +1235,9 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string
 		result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET;
 #line 106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return result;
-#line 1218 "RESTSupport.c"
+#line 1238 "RESTSupport.c"
 	} else {
-		const gchar* _tmp1_ = NULL;
+		const gchar* _tmp1_;
 #line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp1_ = str;
 #line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1226,9 +1246,9 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string
 			result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT;
 #line 108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 1229 "RESTSupport.c"
+#line 1249 "RESTSupport.c"
 		} else {
-			const gchar* _tmp2_ = NULL;
+			const gchar* _tmp2_;
 #line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp2_ = str;
 #line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1237,14 +1257,14 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string
 				result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST;
 #line 110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return result;
-#line 1240 "RESTSupport.c"
+#line 1260 "RESTSupport.c"
 			} else {
-				const gchar* _tmp3_ = NULL;
+				const gchar* _tmp3_;
 #line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp3_ = str;
 #line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_error ("RESTSupport.vala:112: unrecognized HTTP method name: %s", _tmp3_);
-#line 1247 "RESTSupport.c"
+#line 1267 "RESTSupport.c"
 			}
 		}
 	}
@@ -1265,10 +1285,10 @@ GType publishing_rest_support_http_method_get_type (void) {
 
 PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType object_type, const gchar* key, const gchar* value) {
 	PublishingRESTSupportArgument* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (key != NULL, NULL);
 #line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1293,25 +1313,25 @@ PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType
 	self->value = _tmp3_;
 #line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 1296 "RESTSupport.c"
+#line 1316 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value) {
 #line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_argument_construct (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, key, value);
-#line 1303 "RESTSupport.c"
+#line 1323 "RESTSupport.c"
 }
 
 
 gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* arg1, PublishingRESTSupportArgument* arg2) {
 	gint result = 0;
-	GCompareFunc _tmp0_ = NULL;
-	PublishingRESTSupportArgument* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingRESTSupportArgument* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	GCompareFunc _tmp0_;
+	PublishingRESTSupportArgument* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingRESTSupportArgument* _tmp3_;
+	const gchar* _tmp4_;
+	gint _tmp5_;
 #line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (arg1), 0);
 #line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1332,7 +1352,7 @@ gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* ar
 	result = _tmp5_;
 #line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1335 "RESTSupport.c"
+#line 1355 "RESTSupport.c"
 }
 
 
@@ -1341,28 +1361,28 @@ static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconst
 	result = publishing_rest_support_argument_compare ((PublishingRESTSupportArgument*) a, (PublishingRESTSupportArgument*) b);
 #line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1344 "RESTSupport.c"
+#line 1364 "RESTSupport.c"
 }
 
 
 static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 1351 "RESTSupport.c"
+#line 1371 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportArgument** publishing_rest_support_argument_sort (PublishingRESTSupportArgument** inputArray, int inputArray_length1, int* result_length1) {
 	PublishingRESTSupportArgument** result = NULL;
 	GeeTreeSet* sorted_args = NULL;
-	GeeTreeSet* _tmp0_ = NULL;
-	PublishingRESTSupportArgument** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	GeeTreeSet* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	gpointer* _tmp7_ = NULL;
-	PublishingRESTSupportArgument** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
+	GeeTreeSet* _tmp0_;
+	PublishingRESTSupportArgument** _tmp1_;
+	gint _tmp1__length1;
+	GeeTreeSet* _tmp5_;
+	gint _tmp6_;
+	gpointer* _tmp7_;
+	PublishingRESTSupportArgument** _tmp8_;
+	gint _tmp8__length1;
 #line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = gee_tree_set_new (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, (GBoxedCopyFunc) publishing_rest_support_argument_ref, (GDestroyNotify) publishing_rest_support_argument_unref, _publishing_rest_support_argument_compare_gcompare_data_func, NULL, NULL);
 #line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1371,7 +1391,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
 	_tmp1_ = inputArray;
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1__length1 = inputArray_length1;
-#line 1374 "RESTSupport.c"
+#line 1394 "RESTSupport.c"
 	{
 		PublishingRESTSupportArgument** arg_collection = NULL;
 		gint arg_collection_length1 = 0;
@@ -1383,17 +1403,17 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
 		arg_collection_length1 = _tmp1__length1;
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		for (arg_it = 0; arg_it < _tmp1__length1; arg_it = arg_it + 1) {
-#line 1386 "RESTSupport.c"
-			PublishingRESTSupportArgument* _tmp2_ = NULL;
+#line 1406 "RESTSupport.c"
+			PublishingRESTSupportArgument* _tmp2_;
 			PublishingRESTSupportArgument* arg = NULL;
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp2_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			arg = _tmp2_;
-#line 1393 "RESTSupport.c"
+#line 1413 "RESTSupport.c"
 			{
-				GeeTreeSet* _tmp3_ = NULL;
-				PublishingRESTSupportArgument* _tmp4_ = NULL;
+				GeeTreeSet* _tmp3_;
+				PublishingRESTSupportArgument* _tmp4_;
 #line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp3_ = sorted_args;
 #line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1402,7 +1422,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_publishing_rest_support_argument_unref0 (arg);
-#line 1405 "RESTSupport.c"
+#line 1425 "RESTSupport.c"
 			}
 		}
 	}
@@ -1418,7 +1438,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
 	if (result_length1) {
 #line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*result_length1 = _tmp8__length1;
-#line 1421 "RESTSupport.c"
+#line 1441 "RESTSupport.c"
 	}
 #line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp8_;
@@ -1426,15 +1446,15 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
 	_g_object_unref0 (sorted_args);
 #line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1429 "RESTSupport.c"
+#line 1449 "RESTSupport.c"
 }
 
 
 gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (self), NULL);
 #line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1447,14 +1467,14 @@ gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument
 	result = _tmp2_;
 #line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1450 "RESTSupport.c"
+#line 1470 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_argument_init (GValue* value) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 1457 "RESTSupport.c"
+#line 1477 "RESTSupport.c"
 }
 
 
@@ -1463,7 +1483,7 @@ static void publishing_rest_support_value_argument_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_argument_unref (value->data[0].v_pointer);
-#line 1466 "RESTSupport.c"
+#line 1486 "RESTSupport.c"
 	}
 }
 
@@ -1473,11 +1493,11 @@ static void publishing_rest_support_value_argument_copy_value (const GValue* src
 	if (src_value->data[0].v_pointer) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_argument_ref (src_value->data[0].v_pointer);
-#line 1476 "RESTSupport.c"
+#line 1496 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1480 "RESTSupport.c"
+#line 1500 "RESTSupport.c"
 	}
 }
 
@@ -1485,66 +1505,66 @@ static void publishing_rest_support_value_argument_copy_value (const GValue* src
 static gpointer publishing_rest_support_value_argument_peek_pointer (const GValue* value) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 1488 "RESTSupport.c"
+#line 1508 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_argument_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 1495 "RESTSupport.c"
-		PublishingRESTSupportArgument* object;
+#line 1515 "RESTSupport.c"
+		PublishingRESTSupportArgument * object;
 		object = collect_values[0].v_pointer;
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1502 "RESTSupport.c"
+#line 1522 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 1506 "RESTSupport.c"
+#line 1526 "RESTSupport.c"
 		}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_argument_ref (object);
-#line 1510 "RESTSupport.c"
+#line 1530 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1514 "RESTSupport.c"
+#line 1534 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1518 "RESTSupport.c"
+#line 1538 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_argument_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingRESTSupportArgument** object_p;
+	PublishingRESTSupportArgument ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!object_p) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1529 "RESTSupport.c"
+#line 1549 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 1535 "RESTSupport.c"
+#line 1555 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1539 "RESTSupport.c"
+#line 1559 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_argument_ref (value->data[0].v_pointer);
-#line 1543 "RESTSupport.c"
+#line 1563 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1547 "RESTSupport.c"
+#line 1567 "RESTSupport.c"
 }
 
 
@@ -1558,7 +1578,7 @@ GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 1561 "RESTSupport.c"
+#line 1581 "RESTSupport.c"
 }
 
 
@@ -1567,12 +1587,12 @@ gpointer publishing_rest_support_value_get_argument (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT), NULL);
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 1570 "RESTSupport.c"
+#line 1590 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_value_set_argument (GValue* value, gpointer v_object) {
-	PublishingRESTSupportArgument* old;
+	PublishingRESTSupportArgument * old;
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT));
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1587,23 +1607,23 @@ void publishing_rest_support_value_set_argument (GValue* value, gpointer v_objec
 		value->data[0].v_pointer = v_object;
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_argument_ref (value->data[0].v_pointer);
-#line 1590 "RESTSupport.c"
+#line 1610 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1594 "RESTSupport.c"
+#line 1614 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_argument_unref (old);
-#line 1600 "RESTSupport.c"
+#line 1620 "RESTSupport.c"
 	}
 }
 
 
 void publishing_rest_support_value_take_argument (GValue* value, gpointer v_object) {
-	PublishingRESTSupportArgument* old;
+	PublishingRESTSupportArgument * old;
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT));
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1616,17 +1636,17 @@ void publishing_rest_support_value_take_argument (GValue* value, gpointer v_obje
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 1619 "RESTSupport.c"
+#line 1639 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1623 "RESTSupport.c"
+#line 1643 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_argument_unref (old);
-#line 1629 "RESTSupport.c"
+#line 1649 "RESTSupport.c"
 	}
 }
 
@@ -1636,18 +1656,18 @@ static void publishing_rest_support_argument_class_init (PublishingRESTSupportAr
 	publishing_rest_support_argument_parent_class = g_type_class_peek_parent (klass);
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportArgumentClass *) klass)->finalize = publishing_rest_support_argument_finalize;
-#line 1639 "RESTSupport.c"
+#line 1659 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_argument_instance_init (PublishingRESTSupportArgument * self) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 1646 "RESTSupport.c"
+#line 1666 "RESTSupport.c"
 }
 
 
-static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgument* obj) {
+static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgument * obj) {
 	PublishingRESTSupportArgument * self;
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, PublishingRESTSupportArgument);
@@ -1657,7 +1677,7 @@ static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgu
 	_g_free0 (self->key);
 #line 119 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->value);
-#line 1660 "RESTSupport.c"
+#line 1680 "RESTSupport.c"
 }
 
 
@@ -1676,18 +1696,18 @@ GType publishing_rest_support_argument_get_type (void) {
 
 
 gpointer publishing_rest_support_argument_ref (gpointer instance) {
-	PublishingRESTSupportArgument* self;
+	PublishingRESTSupportArgument * self;
 	self = instance;
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 1685 "RESTSupport.c"
+#line 1705 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_argument_unref (gpointer instance) {
-	PublishingRESTSupportArgument* self;
+	PublishingRESTSupportArgument * self;
 	self = instance;
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -1695,7 +1715,7 @@ void publishing_rest_support_argument_unref (gpointer instance) {
 		PUBLISHING_REST_SUPPORT_ARGUMENT_GET_CLASS (self)->finalize (self);
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1698 "RESTSupport.c"
+#line 1718 "RESTSupport.c"
 	}
 }
 
@@ -1703,24 +1723,24 @@ void publishing_rest_support_argument_unref (gpointer instance) {
 static void _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self) {
 #line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_on_wrote_body_data ((PublishingRESTSupportTransaction*) self, chunk);
-#line 1706 "RESTSupport.c"
+#line 1726 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type, PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method) {
 	PublishingRESTSupportTransaction* self = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	PublishingRESTSupportSession* _tmp3_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp4_ = 0;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	PublishingRESTSupportSession* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	SoupMessage* _tmp10_ = NULL;
-	SoupMessage* _tmp11_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	PublishingRESTSupportSession* _tmp3_;
+	PublishingRESTSupportHttpMethod _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	PublishingRESTSupportSession* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	SoupMessage* _tmp10_;
+	SoupMessage* _tmp11_;
 #line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (parent_session), NULL);
 #line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1767,27 +1787,27 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct
 	g_signal_connect (_tmp11_, "wrote-body-data", (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
 #line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 1770 "RESTSupport.c"
+#line 1790 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method) {
 #line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, method);
-#line 1777 "RESTSupport.c"
+#line 1797 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
 	PublishingRESTSupportTransaction* self = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp3_ = 0;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	SoupMessage* _tmp7_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	PublishingRESTSupportHttpMethod _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	SoupMessage* _tmp7_;
 #line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (parent_session), NULL);
 #line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1824,25 +1844,25 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_
 	_g_free0 (_tmp5_);
 #line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 1827 "RESTSupport.c"
+#line 1847 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
 #line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, endpoint_url, method);
-#line 1834 "RESTSupport.c"
+#line 1854 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRESTSupportTransaction* self, SoupBuffer* written_data) {
-	gint _tmp0_ = 0;
-	SoupBuffer* _tmp1_ = NULL;
-	gsize _tmp2_ = 0UL;
-	gint _tmp3_ = 0;
-	SoupMessage* _tmp4_ = NULL;
-	SoupMessageBody* _tmp5_ = NULL;
-	gint64 _tmp6_ = 0LL;
+	gint _tmp0_;
+	SoupBuffer* _tmp1_;
+	gsize _tmp2_;
+	gint _tmp3_;
+	SoupMessage* _tmp4_;
+	SoupMessageBody* _tmp5_;
+	gint64 _tmp6_;
 #line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
 #line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1864,21 +1884,21 @@ static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRE
 #line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = _tmp5_->length;
 #line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_emit_by_name (self, "chunk-transmitted", _tmp3_, (gint) _tmp6_);
-#line 1868 "RESTSupport.c"
+	g_signal_emit (self, publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_CHUNK_TRANSMITTED_SIGNAL], 0, _tmp3_, (gint) _tmp6_);
+#line 1888 "RESTSupport.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
 #line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 1875 "RESTSupport.c"
+#line 1895 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_transaction_on_message_unqueued (PublishingRESTSupportTransaction* self, SoupMessage* message) {
-	SoupMessage* _tmp0_ = NULL;
-	SoupMessage* _tmp1_ = NULL;
+	SoupMessage* _tmp0_;
+	SoupMessage* _tmp1_;
 	GError * _inner_error_ = NULL;
 #line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
@@ -1892,10 +1912,10 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 	if (_tmp0_ != _tmp1_) {
 #line 183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 1895 "RESTSupport.c"
+#line 1915 "RESTSupport.c"
 	}
 	{
-		SoupMessage* _tmp2_ = NULL;
+		SoupMessage* _tmp2_;
 #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = message;
 #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1904,7 +1924,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1907 "RESTSupport.c"
+#line 1927 "RESTSupport.c"
 				goto __catch0_spit_publishing_publishing_error;
 			}
 #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1913,19 +1933,19 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 			g_clear_error (&_inner_error_);
 #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 1916 "RESTSupport.c"
+#line 1936 "RESTSupport.c"
 		}
 	}
 	goto __finally0;
 	__catch0_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
+		GError* _tmp3_;
+		const gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		GError* _tmp7_;
+		GError* _tmp8_;
 #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		err = _inner_error_;
 #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1954,7 +1974,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 		self->priv->err = _tmp8_;
 #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (err);
-#line 1957 "RESTSupport.c"
+#line 1977 "RESTSupport.c"
 	}
 	__finally0:
 #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1965,7 +1985,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 		g_clear_error (&_inner_error_);
 #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 1968 "RESTSupport.c"
+#line 1988 "RESTSupport.c"
 	}
 }
 
@@ -1973,35 +1993,35 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 static gpointer _g_object_ref0 (gpointer self) {
 #line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1976 "RESTSupport.c"
+#line 1996 "RESTSupport.c"
 }
 
 
-gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate** cert) {
+gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate* * cert) {
 	GTlsCertificate* _vala_cert = NULL;
 	gchar* result = NULL;
 	GTlsCertificateFlags tls_errors = 0;
-	SoupMessage* _tmp0_ = NULL;
+	SoupMessage* _tmp0_;
 	GTlsCertificate* _tmp1_ = NULL;
 	GTlsCertificateFlags _tmp2_ = 0;
-	GTlsCertificate* _tmp3_ = NULL;
+	GTlsCertificate* _tmp3_;
 	GeeArrayList* list = NULL;
-	GeeArrayList* _tmp4_ = NULL;
-	GTlsCertificateFlags _tmp5_ = 0;
-	GTlsCertificateFlags _tmp8_ = 0;
-	GTlsCertificateFlags _tmp11_ = 0;
-	GTlsCertificateFlags _tmp14_ = 0;
-	GTlsCertificateFlags _tmp17_ = 0;
-	GTlsCertificateFlags _tmp20_ = 0;
-	GTlsCertificateFlags _tmp23_ = 0;
+	GeeArrayList* _tmp4_;
+	GTlsCertificateFlags _tmp5_;
+	GTlsCertificateFlags _tmp7_;
+	GTlsCertificateFlags _tmp9_;
+	GTlsCertificateFlags _tmp11_;
+	GTlsCertificateFlags _tmp13_;
+	GTlsCertificateFlags _tmp15_;
+	GTlsCertificateFlags _tmp17_;
 	GString* builder = NULL;
-	GString* _tmp26_ = NULL;
-	GeeArrayList* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	GString* _tmp47_ = NULL;
-	const gchar* _tmp48_ = NULL;
-	gchar* _tmp49_ = NULL;
+	GString* _tmp19_;
+	GeeArrayList* _tmp20_;
+	gint _tmp21_;
+	gint _tmp22_;
+	GString* _tmp40_;
+	const gchar* _tmp41_;
+	gchar* _tmp42_;
 #line 195 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
 #line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2024,227 +2044,206 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 	_tmp5_ = tls_errors;
 #line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp5_ & G_TLS_CERTIFICATE_BAD_IDENTITY) == G_TLS_CERTIFICATE_BAD_IDENTITY) {
-#line 2027 "RESTSupport.c"
-		GeeArrayList* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+#line 2047 "RESTSupport.c"
+		GeeArrayList* _tmp6_;
 #line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = list;
 #line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp7_ = _ ("⚫ This website presented identification that belongs to a different we" \
-"bsite.");
-#line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_);
-#line 2036 "RESTSupport.c"
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website presented identification that belongs to a different we" \
+"bsite."));
+#line 2053 "RESTSupport.c"
 	}
 #line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp8_ = tls_errors;
+	_tmp7_ = tls_errors;
 #line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if ((_tmp8_ & G_TLS_CERTIFICATE_EXPIRED) == G_TLS_CERTIFICATE_EXPIRED) {
-#line 2042 "RESTSupport.c"
-		GeeArrayList* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-#line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp9_ = list;
+	if ((_tmp7_ & G_TLS_CERTIFICATE_EXPIRED) == G_TLS_CERTIFICATE_EXPIRED) {
+#line 2059 "RESTSupport.c"
+		GeeArrayList* _tmp8_;
 #line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp10_ = _ ("⚫ This website’s identification is too old to trust. Check the date on" \
-" your computer’s calendar.");
+		_tmp8_ = list;
 #line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
-#line 2051 "RESTSupport.c"
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification is too old to trust. Check the date on" \
+" your computer’s calendar."));
+#line 2065 "RESTSupport.c"
 	}
 #line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp11_ = tls_errors;
+	_tmp9_ = tls_errors;
 #line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if ((_tmp11_ & G_TLS_CERTIFICATE_UNKNOWN_CA) == G_TLS_CERTIFICATE_UNKNOWN_CA) {
-#line 2057 "RESTSupport.c"
-		GeeArrayList* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
+	if ((_tmp9_ & G_TLS_CERTIFICATE_UNKNOWN_CA) == G_TLS_CERTIFICATE_UNKNOWN_CA) {
+#line 2071 "RESTSupport.c"
+		GeeArrayList* _tmp10_;
 #line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp12_ = list;
+		_tmp10_ = list;
 #line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp13_ = _ ("⚫ This website’s identification was not issued by a trusted organizati" \
-"on.");
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
-#line 2066 "RESTSupport.c"
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification was not issued by a trusted organizati" \
+"on."));
+#line 2077 "RESTSupport.c"
 	}
 #line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp14_ = tls_errors;
+	_tmp11_ = tls_errors;
 #line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if ((_tmp14_ & G_TLS_CERTIFICATE_GENERIC_ERROR) == G_TLS_CERTIFICATE_GENERIC_ERROR) {
-#line 2072 "RESTSupport.c"
-		GeeArrayList* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
-#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp15_ = list;
+	if ((_tmp11_ & G_TLS_CERTIFICATE_GENERIC_ERROR) == G_TLS_CERTIFICATE_GENERIC_ERROR) {
+#line 2083 "RESTSupport.c"
+		GeeArrayList* _tmp12_;
 #line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp16_ = _ ("⚫ This website’s identification could not be processed. It may be corr" \
-"upted.");
+		_tmp12_ = list;
 #line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_);
-#line 2081 "RESTSupport.c"
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification could not be processed. It may be corr" \
+"upted."));
+#line 2089 "RESTSupport.c"
 	}
 #line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp17_ = tls_errors;
+	_tmp13_ = tls_errors;
 #line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if ((_tmp17_ & G_TLS_CERTIFICATE_REVOKED) == G_TLS_CERTIFICATE_REVOKED) {
-#line 2087 "RESTSupport.c"
-		GeeArrayList* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp18_ = list;
+	if ((_tmp13_ & G_TLS_CERTIFICATE_REVOKED) == G_TLS_CERTIFICATE_REVOKED) {
+#line 2095 "RESTSupport.c"
+		GeeArrayList* _tmp14_;
 #line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp19_ = _ ("⚫ This website’s identification has been revoked by the trusted organi" \
-"zation that issued it.");
+		_tmp14_ = list;
 #line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_);
-#line 2096 "RESTSupport.c"
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification has been revoked by the trusted organi" \
+"zation that issued it."));
+#line 2101 "RESTSupport.c"
 	}
 #line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp20_ = tls_errors;
+	_tmp15_ = tls_errors;
 #line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if ((_tmp20_ & G_TLS_CERTIFICATE_INSECURE) == G_TLS_CERTIFICATE_INSECURE) {
-#line 2102 "RESTSupport.c"
-		GeeArrayList* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
+	if ((_tmp15_ & G_TLS_CERTIFICATE_INSECURE) == G_TLS_CERTIFICATE_INSECURE) {
+#line 2107 "RESTSupport.c"
+		GeeArrayList* _tmp16_;
 #line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp21_ = list;
+		_tmp16_ = list;
 #line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp22_ = _ ("⚫ This website’s identification cannot be trusted because it uses very" \
-" weak encryption.");
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
-#line 2111 "RESTSupport.c"
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification cannot be trusted because it uses very" \
+" weak encryption."));
+#line 2113 "RESTSupport.c"
 	}
 #line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp23_ = tls_errors;
+	_tmp17_ = tls_errors;
 #line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if ((_tmp23_ & G_TLS_CERTIFICATE_NOT_ACTIVATED) == G_TLS_CERTIFICATE_NOT_ACTIVATED) {
-#line 2117 "RESTSupport.c"
-		GeeArrayList* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp24_ = list;
+	if ((_tmp17_ & G_TLS_CERTIFICATE_NOT_ACTIVATED) == G_TLS_CERTIFICATE_NOT_ACTIVATED) {
+#line 2119 "RESTSupport.c"
+		GeeArrayList* _tmp18_;
 #line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp25_ = _ ("⚫ This website’s identification is only valid for future dates. Check " \
-"the date on your computer’s calendar.");
+		_tmp18_ = list;
 #line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp25_);
-#line 2126 "RESTSupport.c"
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _ ("⚫ This website’s identification is only valid for future dates. Check " \
+"the date on your computer’s calendar."));
+#line 2125 "RESTSupport.c"
 	}
 #line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp26_ = g_string_new ("");
+	_tmp19_ = g_string_new ("");
 #line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	builder = _tmp26_;
+	builder = _tmp19_;
 #line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp27_ = list;
+	_tmp20_ = list;
 #line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+	_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp29_ = _tmp28_;
+	_tmp22_ = _tmp21_;
 #line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (_tmp29_ == 1) {
-#line 2140 "RESTSupport.c"
-		GString* _tmp30_ = NULL;
-		GeeArrayList* _tmp31_ = NULL;
-		gpointer _tmp32_ = NULL;
-		gchar* _tmp33_ = NULL;
+	if (_tmp22_ == 1) {
+#line 2139 "RESTSupport.c"
+		GString* _tmp23_;
+		GeeArrayList* _tmp24_;
+		gpointer _tmp25_;
+		gchar* _tmp26_;
 #line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp30_ = builder;
+		_tmp23_ = builder;
 #line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp31_ = list;
+		_tmp24_ = list;
 #line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp32_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
+		_tmp25_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
 #line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp33_ = (gchar*) _tmp32_;
+		_tmp26_ = (gchar*) _tmp25_;
 #line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		g_string_append (_tmp30_, _tmp33_);
+		g_string_append (_tmp23_, _tmp26_);
 #line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_free0 (_tmp33_);
-#line 2157 "RESTSupport.c"
+		_g_free0 (_tmp26_);
+#line 2156 "RESTSupport.c"
 	} else {
 		{
 			GeeArrayList* _entry_list = NULL;
-			GeeArrayList* _tmp34_ = NULL;
-			GeeArrayList* _tmp35_ = NULL;
+			GeeArrayList* _tmp27_;
+			GeeArrayList* _tmp28_;
 			gint _entry_size = 0;
-			GeeArrayList* _tmp36_ = NULL;
-			gint _tmp37_ = 0;
-			gint _tmp38_ = 0;
+			GeeArrayList* _tmp29_;
+			gint _tmp30_;
+			gint _tmp31_;
 			gint _entry_index = 0;
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_tmp34_ = list;
+			_tmp27_ = list;
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_tmp35_ = _g_object_ref0 (_tmp34_);
+			_tmp28_ = _g_object_ref0 (_tmp27_);
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_entry_list = _tmp35_;
+			_entry_list = _tmp28_;
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_tmp36_ = _entry_list;
+			_tmp29_ = _entry_list;
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+			_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_tmp38_ = _tmp37_;
+			_tmp31_ = _tmp30_;
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_entry_size = _tmp38_;
+			_entry_size = _tmp31_;
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_entry_index = -1;
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			while (TRUE) {
-#line 2186 "RESTSupport.c"
-				gint _tmp39_ = 0;
-				gint _tmp40_ = 0;
-				gint _tmp41_ = 0;
+#line 2185 "RESTSupport.c"
+				gint _tmp32_;
+				gint _tmp33_;
+				gint _tmp34_;
 				gchar* entry = NULL;
-				GeeArrayList* _tmp42_ = NULL;
-				gint _tmp43_ = 0;
-				gpointer _tmp44_ = NULL;
-				GString* _tmp45_ = NULL;
-				const gchar* _tmp46_ = NULL;
+				GeeArrayList* _tmp35_;
+				gint _tmp36_;
+				gpointer _tmp37_;
+				GString* _tmp38_;
+				const gchar* _tmp39_;
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-				_tmp39_ = _entry_index;
+				_tmp32_ = _entry_index;
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-				_entry_index = _tmp39_ + 1;
+				_entry_index = _tmp32_ + 1;
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-				_tmp40_ = _entry_index;
+				_tmp33_ = _entry_index;
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-				_tmp41_ = _entry_size;
+				_tmp34_ = _entry_size;
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-				if (!(_tmp40_ < _tmp41_)) {
+				if (!(_tmp33_ < _tmp34_)) {
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 2208 "RESTSupport.c"
+#line 2207 "RESTSupport.c"
 				}
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-				_tmp42_ = _entry_list;
+				_tmp35_ = _entry_list;
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-				_tmp43_ = _entry_index;
+				_tmp36_ = _entry_index;
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-				_tmp44_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp43_);
+				_tmp37_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp36_);
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-				entry = (gchar*) _tmp44_;
+				entry = (gchar*) _tmp37_;
 #line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-				_tmp45_ = builder;
+				_tmp38_ = builder;
 #line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-				_tmp46_ = entry;
+				_tmp39_ = entry;
 #line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-				g_string_append_printf (_tmp45_, "%s\n", _tmp46_);
+				g_string_append_printf (_tmp38_, "%s\n", _tmp39_);
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_free0 (entry);
-#line 2226 "RESTSupport.c"
+#line 2225 "RESTSupport.c"
 			}
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_object_unref0 (_entry_list);
-#line 2230 "RESTSupport.c"
+#line 2229 "RESTSupport.c"
 		}
 	}
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp47_ = builder;
+	_tmp40_ = builder;
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp48_ = _tmp47_->str;
+	_tmp41_ = _tmp40_->str;
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp49_ = g_strdup (_tmp48_);
+	_tmp42_ = g_strdup (_tmp41_);
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	result = _tmp49_;
+	result = _tmp42_;
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_string_free0 (builder);
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2253,27 +2252,27 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 	if (cert) {
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*cert = _vala_cert;
-#line 2249 "RESTSupport.c"
+#line 2248 "RESTSupport.c"
 	} else {
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_object_unref0 (_vala_cert);
-#line 2253 "RESTSupport.c"
+#line 2252 "RESTSupport.c"
 	}
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2257 "RESTSupport.c"
+#line 2256 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self, SoupMessage* message, GError** error) {
-	SoupMessage* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	guint _tmp2_ = 0U;
+	SoupMessage* _tmp0_;
+	guint _tmp1_;
+	guint _tmp2_;
 	gboolean _tmp42_ = FALSE;
-	SoupMessage* _tmp43_ = NULL;
-	SoupMessageBody* _tmp44_ = NULL;
-	guint8* _tmp45_ = NULL;
-	gint _tmp45__length1 = 0;
+	SoupMessage* _tmp43_;
+	SoupMessageBody* _tmp44_;
+	guint8* _tmp45_;
+	gint _tmp45__length1;
 	GError * _inner_error_ = NULL;
 #line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
@@ -2291,25 +2290,25 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 		case SOUP_STATUS_OK:
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CREATED:
-#line 2287 "RESTSupport.c"
+#line 2286 "RESTSupport.c"
 		{
 #line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			break;
-#line 2291 "RESTSupport.c"
+#line 2290 "RESTSupport.c"
 		}
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_RESOLVE:
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_RESOLVE_PROXY:
-#line 2297 "RESTSupport.c"
+#line 2296 "RESTSupport.c"
 		{
-			gchar* _tmp3_ = NULL;
-			gchar* _tmp4_ = NULL;
-			SoupMessage* _tmp5_ = NULL;
-			guint _tmp6_ = 0U;
-			guint _tmp7_ = 0U;
-			GError* _tmp8_ = NULL;
-			GError* _tmp9_ = NULL;
+			gchar* _tmp3_;
+			gchar* _tmp4_;
+			SoupMessage* _tmp5_;
+			guint _tmp6_;
+			guint _tmp7_;
+			GError* _tmp8_;
+			GError* _tmp9_;
 #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp3_ = publishing_rest_support_transaction_get_endpoint_url (self);
 #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2334,7 +2333,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_propagate_error (error, _inner_error_);
 #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2330 "RESTSupport.c"
+#line 2329 "RESTSupport.c"
 			} else {
 #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -2342,22 +2341,22 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_clear_error (&_inner_error_);
 #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2338 "RESTSupport.c"
+#line 2337 "RESTSupport.c"
 			}
 		}
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_CONNECT:
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_CONNECT_PROXY:
-#line 2345 "RESTSupport.c"
+#line 2344 "RESTSupport.c"
 		{
-			gchar* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-			SoupMessage* _tmp12_ = NULL;
-			guint _tmp13_ = 0U;
-			guint _tmp14_ = 0U;
-			GError* _tmp15_ = NULL;
-			GError* _tmp16_ = NULL;
+			gchar* _tmp10_;
+			gchar* _tmp11_;
+			SoupMessage* _tmp12_;
+			guint _tmp13_;
+			guint _tmp14_;
+			GError* _tmp15_;
+			GError* _tmp16_;
 #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp10_ = publishing_rest_support_transaction_get_endpoint_url (self);
 #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2382,7 +2381,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_propagate_error (error, _inner_error_);
 #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2378 "RESTSupport.c"
+#line 2377 "RESTSupport.c"
 			} else {
 #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -2390,17 +2389,17 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_clear_error (&_inner_error_);
 #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2386 "RESTSupport.c"
+#line 2385 "RESTSupport.c"
 			}
 		}
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_SSL_FAILED:
-#line 2391 "RESTSupport.c"
+#line 2390 "RESTSupport.c"
 		{
-			gchar* _tmp17_ = NULL;
-			gchar* _tmp18_ = NULL;
-			GError* _tmp19_ = NULL;
-			GError* _tmp20_ = NULL;
+			gchar* _tmp17_;
+			gchar* _tmp18_;
+			GError* _tmp19_;
+			GError* _tmp20_;
 #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp17_ = publishing_rest_support_transaction_get_endpoint_url (self);
 #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2419,7 +2418,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_propagate_error (error, _inner_error_);
 #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2415 "RESTSupport.c"
+#line 2414 "RESTSupport.c"
 			} else {
 #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -2427,14 +2426,14 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_clear_error (&_inner_error_);
 #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2423 "RESTSupport.c"
+#line 2422 "RESTSupport.c"
 			}
 		}
 		default:
 		{
-			SoupMessage* _tmp21_ = NULL;
-			guint _tmp22_ = 0U;
-			guint _tmp23_ = 0U;
+			SoupMessage* _tmp21_;
+			guint _tmp22_;
+			guint _tmp23_;
 #line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp21_ = message;
 #line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2443,18 +2442,18 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 			_tmp23_ = _tmp22_;
 #line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_tmp23_ >= ((guint) 100)) {
-#line 2439 "RESTSupport.c"
-				gchar* _tmp24_ = NULL;
-				gchar* _tmp25_ = NULL;
-				SoupMessage* _tmp26_ = NULL;
-				guint _tmp27_ = 0U;
-				guint _tmp28_ = 0U;
-				SoupMessage* _tmp29_ = NULL;
-				gchar* _tmp30_ = NULL;
-				gchar* _tmp31_ = NULL;
-				gchar* _tmp32_ = NULL;
-				GError* _tmp33_ = NULL;
-				GError* _tmp34_ = NULL;
+#line 2438 "RESTSupport.c"
+				gchar* _tmp24_;
+				gchar* _tmp25_;
+				SoupMessage* _tmp26_;
+				guint _tmp27_;
+				guint _tmp28_;
+				SoupMessage* _tmp29_;
+				gchar* _tmp30_;
+				gchar* _tmp31_;
+				gchar* _tmp32_;
+				GError* _tmp33_;
+				GError* _tmp34_;
 #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp24_ = publishing_rest_support_transaction_get_endpoint_url (self);
 #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2489,7 +2488,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 					g_propagate_error (error, _inner_error_);
 #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2485 "RESTSupport.c"
+#line 2484 "RESTSupport.c"
 				} else {
 #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -2497,16 +2496,16 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 					g_clear_error (&_inner_error_);
 #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2493 "RESTSupport.c"
+#line 2492 "RESTSupport.c"
 				}
 			} else {
-				gchar* _tmp35_ = NULL;
-				gchar* _tmp36_ = NULL;
-				SoupMessage* _tmp37_ = NULL;
-				guint _tmp38_ = 0U;
-				guint _tmp39_ = 0U;
-				GError* _tmp40_ = NULL;
-				GError* _tmp41_ = NULL;
+				gchar* _tmp35_;
+				gchar* _tmp36_;
+				SoupMessage* _tmp37_;
+				guint _tmp38_;
+				guint _tmp39_;
+				GError* _tmp40_;
+				GError* _tmp41_;
 #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp35_ = publishing_rest_support_transaction_get_endpoint_url (self);
 #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2531,7 +2530,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 					g_propagate_error (error, _inner_error_);
 #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2527 "RESTSupport.c"
+#line 2526 "RESTSupport.c"
 				} else {
 #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -2539,7 +2538,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 					g_clear_error (&_inner_error_);
 #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2535 "RESTSupport.c"
+#line 2534 "RESTSupport.c"
 				}
 			}
 		}
@@ -2556,12 +2555,12 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 	if (_tmp45_ == NULL) {
 #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp42_ = TRUE;
-#line 2552 "RESTSupport.c"
+#line 2551 "RESTSupport.c"
 	} else {
-		SoupMessage* _tmp46_ = NULL;
-		SoupMessageBody* _tmp47_ = NULL;
-		guint8* _tmp48_ = NULL;
-		gint _tmp48__length1 = 0;
+		SoupMessage* _tmp46_;
+		SoupMessageBody* _tmp47_;
+		guint8* _tmp48_;
+		gint _tmp48__length1;
 #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp46_ = message;
 #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2572,15 +2571,15 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 		_tmp48__length1 = (gint) _tmp47_->length;
 #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp42_ = _tmp48__length1 == 0;
-#line 2568 "RESTSupport.c"
+#line 2567 "RESTSupport.c"
 	}
 #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp42_) {
-#line 2572 "RESTSupport.c"
-		gchar* _tmp49_ = NULL;
-		gchar* _tmp50_ = NULL;
-		GError* _tmp51_ = NULL;
-		GError* _tmp52_ = NULL;
+#line 2571 "RESTSupport.c"
+		gchar* _tmp49_;
+		gchar* _tmp50_;
+		GError* _tmp51_;
+		GError* _tmp52_;
 #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp49_ = publishing_rest_support_transaction_get_endpoint_url (self);
 #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2599,7 +2598,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 			g_propagate_error (error, _inner_error_);
 #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2595 "RESTSupport.c"
+#line 2594 "RESTSupport.c"
 		} else {
 #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -2607,7 +2606,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 			g_clear_error (&_inner_error_);
 #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2603 "RESTSupport.c"
+#line 2602 "RESTSupport.c"
 		}
 	}
 }
@@ -2620,28 +2619,28 @@ static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportAr
 	result = g_new0 (PublishingRESTSupportArgument*, length + 1);
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 2616 "RESTSupport.c"
-		PublishingRESTSupportArgument* _tmp0_ = NULL;
+#line 2615 "RESTSupport.c"
+		PublishingRESTSupportArgument* _tmp0_;
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		result[i] = _tmp0_;
-#line 2622 "RESTSupport.c"
+#line 2621 "RESTSupport.c"
 	}
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2626 "RESTSupport.c"
+#line 2625 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self, int* result_length1) {
 	PublishingRESTSupportArgument** result = NULL;
-	PublishingRESTSupportArgument** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	PublishingRESTSupportArgument** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingRESTSupportArgument** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	PublishingRESTSupportArgument** _tmp0_;
+	gint _tmp0__length1;
+	PublishingRESTSupportArgument** _tmp1_;
+	gint _tmp1__length1;
+	PublishingRESTSupportArgument** _tmp2_;
+	gint _tmp2__length1;
 #line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2660,28 +2659,28 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_argument
 	if (result_length1) {
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 2656 "RESTSupport.c"
+#line 2655 "RESTSupport.c"
 	}
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp2_;
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2662 "RESTSupport.c"
+#line 2661 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_arguments (PublishingRESTSupportTransaction* self, int* result_length1) {
 	PublishingRESTSupportArgument** result = NULL;
-	gint _tmp0_ = 0;
-	PublishingRESTSupportArgument** _tmp1_ = NULL;
-	PublishingRESTSupportArgument** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	gint _tmp3_ = 0;
-	PublishingRESTSupportArgument** _tmp4_ = NULL;
-	PublishingRESTSupportArgument** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	PublishingRESTSupportArgument** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
+	gint _tmp0_;
+	PublishingRESTSupportArgument** _tmp1_;
+	PublishingRESTSupportArgument** _tmp2_;
+	gint _tmp2__length1;
+	gint _tmp3_;
+	PublishingRESTSupportArgument** _tmp4_;
+	PublishingRESTSupportArgument** _tmp5_;
+	gint _tmp5__length1;
+	PublishingRESTSupportArgument** _tmp6_;
+	gint _tmp6__length1;
 #line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
 #line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2706,46 +2705,46 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_a
 	if (result_length1) {
 #line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*result_length1 = _tmp6__length1;
-#line 2702 "RESTSupport.c"
+#line 2701 "RESTSupport.c"
 	}
 #line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp6_;
 #line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2708 "RESTSupport.c"
+#line 2707 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self, gboolean is_executed) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 292 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
 #line 293 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = is_executed;
 #line 293 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->is_executed = _tmp0_;
-#line 2720 "RESTSupport.c"
+#line 2719 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued (PublishingRESTSupportSession* _sender, SoupMessage* message, gpointer self) {
 #line 297 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_on_message_unqueued ((PublishingRESTSupportTransaction*) self, message);
-#line 2727 "RESTSupport.c"
+#line 2726 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction* self, GError** error) {
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	SoupMessage* _tmp1_ = NULL;
-	PublishingRESTSupportSession* _tmp2_ = NULL;
-	SoupMessage* _tmp3_ = NULL;
-	PublishingRESTSupportSession* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
-	SoupMessage* _tmp6_ = NULL;
-	guint _tmp7_ = 0U;
-	GError* _tmp8_ = NULL;
-	GError* _tmp10_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	SoupMessage* _tmp1_;
+	PublishingRESTSupportSession* _tmp2_;
+	SoupMessage* _tmp3_;
+	PublishingRESTSupportSession* _tmp4_;
+	guint _tmp5_;
+	SoupMessage* _tmp6_;
+	guint _tmp7_;
+	GError* _tmp8_;
+	GError* _tmp10_;
 	GError * _inner_error_ = NULL;
 #line 296 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
@@ -2779,25 +2778,25 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
 	_tmp8_ = self->priv->err;
 #line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp8_ != NULL) {
-#line 2775 "RESTSupport.c"
-		GError* _tmp9_ = NULL;
+#line 2774 "RESTSupport.c"
+		GError* _tmp9_;
 #line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp9_ = self->priv->err;
 #line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		g_signal_emit_by_name (self, "network-error", _tmp9_);
-#line 2781 "RESTSupport.c"
+		g_signal_emit (self, publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_NETWORK_ERROR_SIGNAL], 0, _tmp9_);
+#line 2780 "RESTSupport.c"
 	} else {
 #line 307 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		g_signal_emit_by_name (self, "completed");
-#line 2785 "RESTSupport.c"
+		g_signal_emit (self, publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_COMPLETED_SIGNAL], 0);
+#line 2784 "RESTSupport.c"
 	}
 #line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = self->priv->err;
 #line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp10_ != NULL) {
-#line 2791 "RESTSupport.c"
-		GError* _tmp11_ = NULL;
-		GError* _tmp12_ = NULL;
+#line 2790 "RESTSupport.c"
+		GError* _tmp11_;
+		GError* _tmp12_;
 #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp11_ = self->priv->err;
 #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2810,7 +2809,7 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
 			g_propagate_error (error, _inner_error_);
 #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2806 "RESTSupport.c"
+#line 2805 "RESTSupport.c"
 		} else {
 #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -2818,7 +2817,7 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
 			g_clear_error (&_inner_error_);
 #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2814 "RESTSupport.c"
+#line 2813 "RESTSupport.c"
 		}
 	}
 }
@@ -2826,12 +2825,12 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
 
 PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (PublishingRESTSupportTransaction* self) {
 	PublishingRESTSupportHttpMethod result = 0;
-	SoupMessage* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp4_ = 0;
-	PublishingRESTSupportHttpMethod _tmp5_ = 0;
+	SoupMessage* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	PublishingRESTSupportHttpMethod _tmp4_;
+	PublishingRESTSupportHttpMethod _tmp5_;
 #line 313 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), 0);
 #line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2852,15 +2851,15 @@ PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (
 	result = _tmp5_;
 #line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2848 "RESTSupport.c"
+#line 2847 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_transaction_real_add_header (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value) {
-	SoupMessage* _tmp0_ = NULL;
-	SoupMessageHeaders* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	SoupMessage* _tmp0_;
+	SoupMessageHeaders* _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
 #line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (key != NULL);
 #line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2875,7 +2874,7 @@ static void publishing_rest_support_transaction_real_add_header (PublishingRESTS
 	_tmp3_ = value;
 #line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	soup_message_headers_append (_tmp1_, _tmp2_, _tmp3_);
-#line 2871 "RESTSupport.c"
+#line 2870 "RESTSupport.c"
 }
 
 
@@ -2884,24 +2883,24 @@ void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransa
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
 #line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->add_header (self, key, value);
-#line 2880 "RESTSupport.c"
+#line 2879 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSupportTransaction* self, const gchar* custom_payload, const gchar* payload_content_type, gulong payload_length) {
-	PublishingRESTSupportHttpMethod _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
+	PublishingRESTSupportHttpMethod _tmp0_;
+	const gchar* _tmp1_;
 	gulong _tmp2_ = 0UL;
-	gulong _tmp3_ = 0UL;
+	gulong _tmp3_;
 	gulong length = 0UL;
-	SoupMessage* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	guint8* _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-	guint8* _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	gulong _tmp13_ = 0UL;
+	SoupMessage* _tmp8_;
+	const gchar* _tmp9_;
+	const gchar* _tmp10_;
+	guint8* _tmp11_;
+	gint _tmp11__length1;
+	guint8* _tmp12_;
+	gint _tmp12__length1;
+	gulong _tmp13_;
 #line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
 #line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2918,23 +2917,23 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
 		self->priv->use_custom_payload = FALSE;
 #line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 2914 "RESTSupport.c"
+#line 2913 "RESTSupport.c"
 	}
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = payload_length;
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp3_ > ((gulong) 0)) {
-#line 2920 "RESTSupport.c"
-		gulong _tmp4_ = 0UL;
+#line 2919 "RESTSupport.c"
+		gulong _tmp4_;
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = payload_length;
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = _tmp4_;
-#line 2926 "RESTSupport.c"
+#line 2925 "RESTSupport.c"
 	} else {
-		const gchar* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		const gchar* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = custom_payload;
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2943,7 +2942,7 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
 		_tmp7_ = _tmp6_;
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = (gulong) _tmp7_;
-#line 2939 "RESTSupport.c"
+#line 2938 "RESTSupport.c"
 	}
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	length = _tmp2_;
@@ -2965,13 +2964,13 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
 	soup_message_set_request (_tmp8_, _tmp9_, SOUP_MEMORY_COPY, _tmp12_ + 0, (gsize) (((gint) _tmp13_) - 0));
 #line 341 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->use_custom_payload = TRUE;
-#line 2961 "RESTSupport.c"
+#line 2960 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_transaction_set_message (PublishingRESTSupportTransaction* self, SoupMessage* message) {
-	SoupMessage* _tmp0_ = NULL;
-	SoupMessage* _tmp1_ = NULL;
+	SoupMessage* _tmp0_;
+	SoupMessage* _tmp1_;
 #line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
 #line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2984,13 +2983,13 @@ void publishing_rest_support_transaction_set_message (PublishingRESTSupportTrans
 	_g_object_unref0 (self->priv->message);
 #line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->message = _tmp1_;
-#line 2980 "RESTSupport.c"
+#line 2979 "RESTSupport.c"
 }
 
 
 gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupportTransaction* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), FALSE);
 #line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2999,16 +2998,16 @@ gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupp
 	result = _tmp0_;
 #line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2995 "RESTSupport.c"
+#line 2994 "RESTSupport.c"
 }
 
 
 guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupportTransaction* self) {
 	guint result = 0U;
-	gboolean _tmp0_ = FALSE;
-	SoupMessage* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
+	gboolean _tmp0_;
+	SoupMessage* _tmp1_;
+	guint _tmp2_;
+	guint _tmp3_;
 #line 357 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), 0U);
 #line 358 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3025,26 +3024,26 @@ guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupport
 	result = _tmp3_;
 #line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3021 "RESTSupport.c"
+#line 3020 "RESTSupport.c"
 }
 
 
 static void _vala_SoupURI_free (SoupURI* self) {
 #line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_boxed_free (soup_uri_get_type (), self);
-#line 3028 "RESTSupport.c"
+#line 3027 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_transaction_real_execute (PublishingRESTSupportTransaction* self, GError** error) {
-	gboolean _tmp0_ = FALSE;
-	PublishingRESTSupportHttpMethod _tmp1_ = 0;
+	gboolean _tmp0_;
+	PublishingRESTSupportHttpMethod _tmp1_;
 	gchar* formdata_string = NULL;
-	gchar* _tmp3_ = NULL;
+	gchar* _tmp3_;
 	gchar* old_url = NULL;
 	gchar* url_with_query = NULL;
 	gboolean _tmp19_ = FALSE;
-	PublishingRESTSupportHttpMethod _tmp20_ = 0;
+	PublishingRESTSupportHttpMethod _tmp20_;
 	GError * _inner_error_ = NULL;
 #line 366 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->use_custom_payload;
@@ -3062,7 +3061,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 				g_propagate_error (error, _inner_error_);
 #line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 3058 "RESTSupport.c"
+#line 3057 "RESTSupport.c"
 			} else {
 #line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -3070,68 +3069,68 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 				g_clear_error (&_inner_error_);
 #line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 3066 "RESTSupport.c"
+#line 3065 "RESTSupport.c"
 			}
 		}
 #line 370 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 3071 "RESTSupport.c"
+#line 3070 "RESTSupport.c"
 	}
 #line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = publishing_rest_support_transaction_get_method (self);
 #line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST) {
-#line 3077 "RESTSupport.c"
-		PublishingRESTSupportArgument** _tmp2_ = NULL;
-		gint _tmp2__length1 = 0;
+#line 3076 "RESTSupport.c"
+		PublishingRESTSupportArgument** _tmp2_;
+		gint _tmp2__length1;
 #line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = self->priv->arguments;
 #line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2__length1 = self->priv->arguments_length1;
 #line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_vala_assert (_tmp2__length1 > 0, "arguments.length > 0");
-#line 3086 "RESTSupport.c"
+#line 3085 "RESTSupport.c"
 	}
 #line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = g_strdup ("");
 #line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	formdata_string = _tmp3_;
-#line 3092 "RESTSupport.c"
+#line 3091 "RESTSupport.c"
 	{
 		gint i = 0;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		i = 0;
-#line 3097 "RESTSupport.c"
+#line 3096 "RESTSupport.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp4_ = TRUE;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			while (TRUE) {
-#line 3104 "RESTSupport.c"
-				gint _tmp6_ = 0;
-				PublishingRESTSupportArgument** _tmp7_ = NULL;
-				gint _tmp7__length1 = 0;
-				const gchar* _tmp8_ = NULL;
-				PublishingRESTSupportArgument** _tmp9_ = NULL;
-				gint _tmp9__length1 = 0;
-				gint _tmp10_ = 0;
-				PublishingRESTSupportArgument* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
-				gchar* _tmp13_ = NULL;
-				gchar* _tmp14_ = NULL;
-				gint _tmp15_ = 0;
-				PublishingRESTSupportArgument** _tmp16_ = NULL;
-				gint _tmp16__length1 = 0;
+#line 3103 "RESTSupport.c"
+				gint _tmp6_;
+				PublishingRESTSupportArgument** _tmp7_;
+				gint _tmp7__length1;
+				const gchar* _tmp8_;
+				PublishingRESTSupportArgument** _tmp9_;
+				gint _tmp9__length1;
+				gint _tmp10_;
+				PublishingRESTSupportArgument* _tmp11_;
+				gchar* _tmp12_;
+				gchar* _tmp13_;
+				gchar* _tmp14_;
+				gint _tmp15_;
+				PublishingRESTSupportArgument** _tmp16_;
+				gint _tmp16__length1;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (!_tmp4_) {
-#line 3121 "RESTSupport.c"
-					gint _tmp5_ = 0;
+#line 3120 "RESTSupport.c"
+					gint _tmp5_;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp5_ = i;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					i = _tmp5_ + 1;
-#line 3127 "RESTSupport.c"
+#line 3126 "RESTSupport.c"
 				}
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = FALSE;
@@ -3145,7 +3144,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 				if (!(_tmp6_ < _tmp7__length1)) {
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 3141 "RESTSupport.c"
+#line 3140 "RESTSupport.c"
 				}
 #line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp8_ = formdata_string;
@@ -3177,9 +3176,9 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 				_tmp16__length1 = self->priv->arguments_length1;
 #line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_tmp15_ < (_tmp16__length1 - 1)) {
-#line 3173 "RESTSupport.c"
-					const gchar* _tmp17_ = NULL;
-					gchar* _tmp18_ = NULL;
+#line 3172 "RESTSupport.c"
+					const gchar* _tmp17_;
+					gchar* _tmp18_;
 #line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp17_ = formdata_string;
 #line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3188,7 +3187,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 					_g_free0 (formdata_string);
 #line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					formdata_string = _tmp18_;
-#line 3184 "RESTSupport.c"
+#line 3183 "RESTSupport.c"
 				}
 			}
 		}
@@ -3201,37 +3200,37 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 	_tmp20_ = publishing_rest_support_transaction_get_method (self);
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp20_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET) {
-#line 3197 "RESTSupport.c"
-		PublishingRESTSupportArgument** _tmp21_ = NULL;
-		gint _tmp21__length1 = 0;
+#line 3196 "RESTSupport.c"
+		PublishingRESTSupportArgument** _tmp21_;
+		gint _tmp21__length1;
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp21_ = self->priv->arguments;
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp21__length1 = self->priv->arguments_length1;
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp19_ = _tmp21__length1 > 0;
-#line 3206 "RESTSupport.c"
+#line 3205 "RESTSupport.c"
 	} else {
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp19_ = FALSE;
-#line 3210 "RESTSupport.c"
+#line 3209 "RESTSupport.c"
 	}
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp19_) {
-#line 3214 "RESTSupport.c"
-		SoupMessage* _tmp22_ = NULL;
-		SoupURI* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
-		gchar* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		SoupMessage* _tmp31_ = NULL;
-		const gchar* _tmp32_ = NULL;
-		SoupURI* _tmp33_ = NULL;
-		SoupURI* _tmp34_ = NULL;
+#line 3213 "RESTSupport.c"
+		SoupMessage* _tmp22_;
+		SoupURI* _tmp23_;
+		gchar* _tmp24_;
+		gchar* _tmp25_;
+		gchar* _tmp26_;
+		gchar* _tmp27_;
+		gchar* _tmp28_;
+		const gchar* _tmp29_;
+		gchar* _tmp30_;
+		SoupMessage* _tmp31_;
+		const gchar* _tmp32_;
+		SoupURI* _tmp33_;
+		SoupURI* _tmp34_;
 #line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp22_ = self->priv->message;
 #line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3274,14 +3273,14 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		soup_message_set_uri (_tmp31_, _tmp34_);
 #line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		__vala_SoupURI_free0 (_tmp34_);
-#line 3270 "RESTSupport.c"
+#line 3269 "RESTSupport.c"
 	} else {
-		SoupMessage* _tmp35_ = NULL;
-		const gchar* _tmp36_ = NULL;
-		guint8* _tmp37_ = NULL;
-		gint _tmp37__length1 = 0;
-		guint8* _tmp38_ = NULL;
-		gint _tmp38__length1 = 0;
+		SoupMessage* _tmp35_;
+		const gchar* _tmp36_;
+		guint8* _tmp37_;
+		gint _tmp37__length1;
+		guint8* _tmp38_;
+		gint _tmp38__length1;
 #line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp35_ = self->priv->message;
 #line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3294,16 +3293,16 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		_tmp38__length1 = _tmp37__length1;
 #line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		soup_message_set_request (_tmp35_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp38_, (gsize) _tmp38__length1);
-#line 3290 "RESTSupport.c"
+#line 3289 "RESTSupport.c"
 	}
 #line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->is_executed = TRUE;
-#line 3294 "RESTSupport.c"
+#line 3293 "RESTSupport.c"
 	{
-		SoupMessage* _tmp39_ = NULL;
-		SoupURI* _tmp40_ = NULL;
-		gchar* _tmp41_ = NULL;
-		gchar* _tmp42_ = NULL;
+		SoupMessage* _tmp39_;
+		SoupURI* _tmp40_;
+		gchar* _tmp41_;
+		gchar* _tmp42_;
 #line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp39_ = self->priv->message;
 #line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3320,22 +3319,22 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		publishing_rest_support_transaction_send (self, &_inner_error_);
 #line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3316 "RESTSupport.c"
+#line 3315 "RESTSupport.c"
 			goto __finally1;
 		}
 	}
 	__finally1:
 	{
-		const gchar* _tmp43_ = NULL;
+		const gchar* _tmp43_;
 #line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp43_ = old_url;
 #line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp43_ != NULL) {
-#line 3327 "RESTSupport.c"
-			SoupMessage* _tmp44_ = NULL;
-			const gchar* _tmp45_ = NULL;
-			SoupURI* _tmp46_ = NULL;
-			SoupURI* _tmp47_ = NULL;
+#line 3326 "RESTSupport.c"
+			SoupMessage* _tmp44_;
+			const gchar* _tmp45_;
+			SoupURI* _tmp46_;
+			SoupURI* _tmp47_;
 #line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp44_ = self->priv->message;
 #line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3348,7 +3347,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 			soup_message_set_uri (_tmp44_, _tmp47_);
 #line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupURI_free0 (_tmp47_);
-#line 3344 "RESTSupport.c"
+#line 3343 "RESTSupport.c"
 		}
 	}
 #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3365,7 +3364,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 			_g_free0 (formdata_string);
 #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 3361 "RESTSupport.c"
+#line 3360 "RESTSupport.c"
 		} else {
 #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (url_with_query);
@@ -3379,7 +3378,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 			g_clear_error (&_inner_error_);
 #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 3375 "RESTSupport.c"
+#line 3374 "RESTSupport.c"
 		}
 	}
 #line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3388,7 +3387,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 	_g_free0 (old_url);
 #line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (formdata_string);
-#line 3384 "RESTSupport.c"
+#line 3383 "RESTSupport.c"
 }
 
 
@@ -3397,18 +3396,18 @@ void publishing_rest_support_transaction_execute (PublishingRESTSupportTransacti
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
 #line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->execute (self, error);
-#line 3393 "RESTSupport.c"
+#line 3392 "RESTSupport.c"
 }
 
 
 gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTransaction* self) {
 	gchar* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	SoupMessage* _tmp1_ = NULL;
-	SoupMessageBody* _tmp2_ = NULL;
-	guint8* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar* _tmp4_ = NULL;
+	gboolean _tmp0_;
+	SoupMessage* _tmp1_;
+	SoupMessageBody* _tmp2_;
+	guint8* _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
 #line 411 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
 #line 412 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3429,15 +3428,15 @@ gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTr
 	result = _tmp4_;
 #line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3425 "RESTSupport.c"
+#line 3424 "RESTSupport.c"
 }
 
 
 SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (PublishingRESTSupportTransaction* self) {
 	SoupMessageHeaders* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	SoupMessage* _tmp1_ = NULL;
-	SoupMessageHeaders* _tmp2_ = NULL;
+	gboolean _tmp0_;
+	SoupMessage* _tmp1_;
+	SoupMessageHeaders* _tmp2_;
 #line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
 #line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3452,15 +3451,15 @@ SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (Pu
 	result = _tmp2_;
 #line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3448 "RESTSupport.c"
+#line 3447 "RESTSupport.c"
 }
 
 
 SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupportTransaction* self) {
 	SoupMessage* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	SoupMessage* _tmp1_ = NULL;
-	SoupMessage* _tmp2_ = NULL;
+	gboolean _tmp0_;
+	SoupMessage* _tmp1_;
+	SoupMessage* _tmp2_;
 #line 421 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
 #line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3475,33 +3474,33 @@ SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupp
 	result = _tmp2_;
 #line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3471 "RESTSupport.c"
+#line 3470 "RESTSupport.c"
 }
 
 
-static void _vala_array_add1 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
+static void _vala_array_add1 (PublishingRESTSupportArgument** * array, int* length, int* size, PublishingRESTSupportArgument* value) {
 #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((*length) == (*size)) {
 #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 3482 "RESTSupport.c"
+#line 3481 "RESTSupport.c"
 	}
 #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	(*array)[(*length)++] = value;
 #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	(*array)[*length] = NULL;
-#line 3488 "RESTSupport.c"
+#line 3487 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTransaction* self, const gchar* name, const gchar* value) {
-	PublishingRESTSupportArgument** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingRESTSupportArgument* _tmp3_ = NULL;
+	PublishingRESTSupportArgument** _tmp0_;
+	gint _tmp0__length1;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingRESTSupportArgument* _tmp3_;
 #line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
 #line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3520,23 +3519,23 @@ void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTran
 	_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
 #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_array_add1 (&self->priv->arguments, &self->priv->arguments_length1, &self->priv->_arguments_size_, _tmp3_);
-#line 3516 "RESTSupport.c"
+#line 3515 "RESTSupport.c"
 }
 
 
 gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSupportTransaction* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp1_;
 #line 430 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->endpoint_url;
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 3530 "RESTSupport.c"
-		const gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+#line 3529 "RESTSupport.c"
+		const gchar* _tmp2_;
+		gchar* _tmp3_;
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = self->priv->endpoint_url;
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3545,10 +3544,10 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
 		_g_free0 (_tmp0_);
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _tmp3_;
-#line 3541 "RESTSupport.c"
+#line 3540 "RESTSupport.c"
 	} else {
-		PublishingRESTSupportSession* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
+		PublishingRESTSupportSession* _tmp4_;
+		gchar* _tmp5_;
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = self->priv->parent_session;
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3557,27 +3556,27 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
 		_g_free0 (_tmp0_);
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _tmp5_;
-#line 3553 "RESTSupport.c"
+#line 3552 "RESTSupport.c"
 	}
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp0_;
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3559 "RESTSupport.c"
+#line 3558 "RESTSupport.c"
 }
 
 
 static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
 #line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3566 "RESTSupport.c"
+#line 3565 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_session (PublishingRESTSupportTransaction* self) {
 	PublishingRESTSupportSession* result = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingRESTSupportSession* _tmp1_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingRESTSupportSession* _tmp1_;
 #line 434 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
 #line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3588,7 +3587,7 @@ PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_ses
 	result = _tmp1_;
 #line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3584 "RESTSupport.c"
+#line 3583 "RESTSupport.c"
 }
 
 
@@ -3607,26 +3606,26 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
 		data1 = closure->data;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 3603 "RESTSupport.c"
+#line 3602 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		data2 = closure->data;
-#line 3609 "RESTSupport.c"
+#line 3608 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 3615 "RESTSupport.c"
+#line 3614 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_transaction_init (GValue* value) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 3622 "RESTSupport.c"
+#line 3621 "RESTSupport.c"
 }
 
 
@@ -3635,7 +3634,7 @@ static void publishing_rest_support_value_transaction_free_value (GValue* value)
 	if (value->data[0].v_pointer) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_unref (value->data[0].v_pointer);
-#line 3631 "RESTSupport.c"
+#line 3630 "RESTSupport.c"
 	}
 }
 
@@ -3645,11 +3644,11 @@ static void publishing_rest_support_value_transaction_copy_value (const GValue*
 	if (src_value->data[0].v_pointer) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_transaction_ref (src_value->data[0].v_pointer);
-#line 3641 "RESTSupport.c"
+#line 3640 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3645 "RESTSupport.c"
+#line 3644 "RESTSupport.c"
 	}
 }
 
@@ -3657,66 +3656,66 @@ static void publishing_rest_support_value_transaction_copy_value (const GValue*
 static gpointer publishing_rest_support_value_transaction_peek_pointer (const GValue* value) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 3653 "RESTSupport.c"
+#line 3652 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_transaction_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 3660 "RESTSupport.c"
-		PublishingRESTSupportTransaction* object;
+#line 3659 "RESTSupport.c"
+		PublishingRESTSupportTransaction * object;
 		object = collect_values[0].v_pointer;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3667 "RESTSupport.c"
+#line 3666 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 3671 "RESTSupport.c"
+#line 3670 "RESTSupport.c"
 		}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_transaction_ref (object);
-#line 3675 "RESTSupport.c"
+#line 3674 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3679 "RESTSupport.c"
+#line 3678 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 3683 "RESTSupport.c"
+#line 3682 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_transaction_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingRESTSupportTransaction** object_p;
+	PublishingRESTSupportTransaction ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!object_p) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3694 "RESTSupport.c"
+#line 3693 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 3700 "RESTSupport.c"
+#line 3699 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3704 "RESTSupport.c"
+#line 3703 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3708 "RESTSupport.c"
+#line 3707 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 3712 "RESTSupport.c"
+#line 3711 "RESTSupport.c"
 }
 
 
@@ -3730,7 +3729,7 @@ GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, c
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 3726 "RESTSupport.c"
+#line 3725 "RESTSupport.c"
 }
 
 
@@ -3739,12 +3738,12 @@ gpointer publishing_rest_support_value_get_transaction (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION), NULL);
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 3735 "RESTSupport.c"
+#line 3734 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_object) {
-	PublishingRESTSupportTransaction* old;
+	PublishingRESTSupportTransaction * old;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3759,23 +3758,23 @@ void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_ob
 		value->data[0].v_pointer = v_object;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3755 "RESTSupport.c"
+#line 3754 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3759 "RESTSupport.c"
+#line 3758 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_unref (old);
-#line 3765 "RESTSupport.c"
+#line 3764 "RESTSupport.c"
 	}
 }
 
 
 void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_object) {
-	PublishingRESTSupportTransaction* old;
+	PublishingRESTSupportTransaction * old;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3788,17 +3787,17 @@ void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_o
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 3784 "RESTSupport.c"
+#line 3783 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3788 "RESTSupport.c"
+#line 3787 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_unref (old);
-#line 3794 "RESTSupport.c"
+#line 3793 "RESTSupport.c"
 	}
 }
 
@@ -3811,16 +3810,16 @@ static void publishing_rest_support_transaction_class_init (PublishingRESTSuppor
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRESTSupportTransactionPrivate));
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->add_header = (void (*)(PublishingRESTSupportTransaction*, const gchar*, const gchar*)) publishing_rest_support_transaction_real_add_header;
+	((PublishingRESTSupportTransactionClass *) klass)->add_header = (void (*) (PublishingRESTSupportTransaction *, const gchar*, const gchar*)) publishing_rest_support_transaction_real_add_header;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_rest_support_transaction_real_execute;
+	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_rest_support_transaction_real_execute;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_new ("chunk_transmitted", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
+	publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_CHUNK_TRANSMITTED_SIGNAL] = g_signal_new ("chunk-transmitted", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_new ("network_error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
+	publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_NETWORK_ERROR_SIGNAL] = g_signal_new ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_new ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3816 "RESTSupport.c"
+	publishing_rest_support_transaction_signals[PUBLISHING_REST_SUPPORT_TRANSACTION_COMPLETED_SIGNAL] = g_signal_new ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 3815 "RESTSupport.c"
 }
 
 
@@ -3841,11 +3840,11 @@ static void publishing_rest_support_transaction_instance_init (PublishingRESTSup
 	self->priv->endpoint_url = NULL;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 3837 "RESTSupport.c"
+#line 3836 "RESTSupport.c"
 }
 
 
-static void publishing_rest_support_transaction_finalize (PublishingRESTSupportTransaction* obj) {
+static void publishing_rest_support_transaction_finalize (PublishingRESTSupportTransaction * obj) {
 	PublishingRESTSupportTransaction * self;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
@@ -3859,7 +3858,7 @@ static void publishing_rest_support_transaction_finalize (PublishingRESTSupportT
 	_g_error_free0 (self->priv->err);
 #line 151 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->priv->endpoint_url);
-#line 3855 "RESTSupport.c"
+#line 3854 "RESTSupport.c"
 }
 
 
@@ -3878,18 +3877,18 @@ GType publishing_rest_support_transaction_get_type (void) {
 
 
 gpointer publishing_rest_support_transaction_ref (gpointer instance) {
-	PublishingRESTSupportTransaction* self;
+	PublishingRESTSupportTransaction * self;
 	self = instance;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 3880 "RESTSupport.c"
+#line 3879 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_transaction_unref (gpointer instance) {
-	PublishingRESTSupportTransaction* self;
+	PublishingRESTSupportTransaction * self;
 	self = instance;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -3897,21 +3896,21 @@ void publishing_rest_support_transaction_unref (gpointer instance) {
 		PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->finalize (self);
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3893 "RESTSupport.c"
+#line 3892 "RESTSupport.c"
 	}
 }
 
 
 PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable) {
 	PublishingRESTSupportUploadTransaction* self = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	SpitPublishingPublishable* _tmp1_ = NULL;
-	SpitPublishingPublishable* _tmp2_ = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
-	SpitPublishingPublisherMediaType _tmp4_ = 0;
-	gchar* _tmp5_ = NULL;
-	GHashTable* _tmp6_ = NULL;
-	GeeHashMap* _tmp7_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	SpitPublishingPublishable* _tmp1_;
+	SpitPublishingPublishable* _tmp2_;
+	SpitPublishingPublishable* _tmp3_;
+	SpitPublishingPublisherMediaType _tmp4_;
+	gchar* _tmp5_;
+	GHashTable* _tmp6_;
+	GeeHashMap* _tmp7_;
 #line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
 #line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3952,28 +3951,28 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
 	self->message_headers = _tmp7_;
 #line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 3948 "RESTSupport.c"
+#line 3947 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable) {
 #line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_upload_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable);
-#line 3955 "RESTSupport.c"
+#line 3954 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url) {
 	PublishingRESTSupportUploadTransaction* self = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	SpitPublishingPublishable* _tmp2_ = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
-	SpitPublishingPublishable* _tmp4_ = NULL;
-	SpitPublishingPublisherMediaType _tmp5_ = 0;
-	gchar* _tmp6_ = NULL;
-	GHashTable* _tmp7_ = NULL;
-	GeeHashMap* _tmp8_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	const gchar* _tmp1_;
+	SpitPublishingPublishable* _tmp2_;
+	SpitPublishingPublishable* _tmp3_;
+	SpitPublishingPublishable* _tmp4_;
+	SpitPublishingPublisherMediaType _tmp5_;
+	gchar* _tmp6_;
+	GHashTable* _tmp7_;
+	GeeHashMap* _tmp8_;
 #line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
 #line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4018,22 +4017,22 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
 	self->message_headers = _tmp8_;
 #line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 4014 "RESTSupport.c"
+#line 4013 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url) {
 #line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_upload_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable, endpoint_url);
-#line 4021 "RESTSupport.c"
+#line 4020 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_upload_transaction_real_add_header (PublishingRESTSupportTransaction* base, const gchar* key, const gchar* value) {
 	PublishingRESTSupportUploadTransaction * self;
-	GeeHashMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	GeeHashMap* _tmp0_;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
 #line 466 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
 #line 466 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4048,43 +4047,43 @@ static void publishing_rest_support_upload_transaction_real_add_header (Publishi
 	_tmp2_ = value;
 #line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, _tmp2_);
-#line 4044 "RESTSupport.c"
+#line 4043 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type (SpitPublishingPublisherMediaType media_type) {
 	gchar* result = NULL;
-	SpitPublishingPublisherMediaType _tmp0_ = 0;
+	SpitPublishingPublisherMediaType _tmp0_;
 #line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = media_type;
 #line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 4055 "RESTSupport.c"
-		gchar* _tmp1_ = NULL;
+#line 4054 "RESTSupport.c"
+		gchar* _tmp1_;
 #line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp1_ = g_strdup ("image/jpeg");
 #line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		result = _tmp1_;
 #line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return result;
-#line 4063 "RESTSupport.c"
+#line 4062 "RESTSupport.c"
 	} else {
-		SpitPublishingPublisherMediaType _tmp2_ = 0;
+		SpitPublishingPublisherMediaType _tmp2_;
 #line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = media_type;
 #line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4070 "RESTSupport.c"
-			gchar* _tmp3_ = NULL;
+#line 4069 "RESTSupport.c"
+			gchar* _tmp3_;
 #line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp3_ = g_strdup ("video/mpeg");
 #line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			result = _tmp3_;
 #line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 4078 "RESTSupport.c"
+#line 4077 "RESTSupport.c"
 		} else {
-			SpitPublishingPublisherMediaType _tmp4_ = 0;
+			SpitPublishingPublisherMediaType _tmp4_;
 			GEnumValue* _tmp5_;
 #line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp4_ = media_type;
@@ -4092,7 +4091,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
 			_tmp5_ = g_enum_get_value (g_type_class_ref (SPIT_PUBLISHING_PUBLISHER_TYPE_MEDIA_TYPE), _tmp4_);
 #line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_error ("RESTSupport.vala:476: UploadTransaction: unknown media type %s.", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL);
-#line 4088 "RESTSupport.c"
+#line 4087 "RESTSupport.c"
 		}
 	}
 }
@@ -4101,23 +4100,23 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
 static void _g_free0_ (gpointer var) {
 #line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	var = (g_free (var), NULL);
-#line 4097 "RESTSupport.c"
+#line 4096 "RESTSupport.c"
 }
 
 
 static GHashTable* publishing_rest_support_upload_transaction_create_default_binary_disposition_table (PublishingRESTSupportUploadTransaction* self) {
 	GHashTable* result = NULL;
 	GHashTable* _result_ = NULL;
-	GHashFunc _tmp0_ = NULL;
-	GEqualFunc _tmp1_ = NULL;
-	GHashTable* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	SpitPublishingPublishable* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
+	GHashFunc _tmp0_;
+	GEqualFunc _tmp1_;
+	GHashTable* _tmp2_;
+	gchar* _tmp3_;
+	SpitPublishingPublishable* _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
 #line 479 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION (self), NULL);
 #line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4152,20 +4151,20 @@ static GHashTable* publishing_rest_support_upload_transaction_create_default_bin
 	result = _result_;
 #line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 4148 "RESTSupport.c"
+#line 4147 "RESTSupport.c"
 }
 
 
 static gpointer _g_hash_table_ref0 (gpointer self) {
 #line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? g_hash_table_ref (self) : NULL;
-#line 4155 "RESTSupport.c"
+#line 4154 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self, GHashTable* new_disp_table) {
-	GHashTable* _tmp0_ = NULL;
-	GHashTable* _tmp1_ = NULL;
+	GHashTable* _tmp0_;
+	GHashTable* _tmp1_;
 #line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION (self));
 #line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4178,79 +4177,79 @@ void publishing_rest_support_upload_transaction_set_binary_disposition_table (Pu
 	_g_hash_table_unref0 (self->binary_disposition_table);
 #line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->binary_disposition_table = _tmp1_;
-#line 4174 "RESTSupport.c"
+#line 4173 "RESTSupport.c"
 }
 
 
 static void _vala_SoupMultipart_free (SoupMultipart* self) {
 #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 4181 "RESTSupport.c"
+#line 4180 "RESTSupport.c"
 }
 
 
 static void _vala_SoupBuffer_free (SoupBuffer* self) {
 #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 4188 "RESTSupport.c"
+#line 4187 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
 	PublishingRESTSupportUploadTransaction * self;
 	PublishingRESTSupportArgument** request_arguments = NULL;
-	gint _tmp0_ = 0;
-	PublishingRESTSupportArgument** _tmp1_ = NULL;
-	gint request_arguments_length1 = 0;
-	gint _request_arguments_size_ = 0;
-	PublishingRESTSupportArgument** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	gint _tmp0_;
+	PublishingRESTSupportArgument** _tmp1_;
+	gint request_arguments_length1;
+	gint _request_arguments_size_;
+	PublishingRESTSupportArgument** _tmp2_;
+	gint _tmp2__length1;
 	SoupMultipart* message_parts = NULL;
-	SoupMultipart* _tmp3_ = NULL;
-	PublishingRESTSupportArgument** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
+	SoupMultipart* _tmp3_;
+	PublishingRESTSupportArgument** _tmp4_;
+	gint _tmp4__length1;
 	gchar* payload = NULL;
 	gsize payload_length = 0UL;
 	gint payload_part_num = 0;
-	SoupMultipart* _tmp20_ = NULL;
-	gint _tmp21_ = 0;
+	SoupMultipart* _tmp19_;
+	gint _tmp20_;
 	SoupBuffer* bindable_data = NULL;
-	const gchar* _tmp22_ = NULL;
-	guint8* _tmp23_ = NULL;
-	gint _tmp23__length1 = 0;
-	guint8* _tmp24_ = NULL;
-	gint _tmp24__length1 = 0;
-	gsize _tmp25_ = 0UL;
-	SoupBuffer* _tmp26_ = NULL;
-	SoupMultipart* _tmp27_ = NULL;
-	SpitPublishingPublishable* _tmp28_ = NULL;
-	GFile* _tmp29_ = NULL;
-	GFile* _tmp30_ = NULL;
-	gchar* _tmp31_ = NULL;
-	gchar* _tmp32_ = NULL;
-	const gchar* _tmp33_ = NULL;
-	SoupBuffer* _tmp34_ = NULL;
+	const gchar* _tmp21_;
+	guint8* _tmp22_;
+	gint _tmp22__length1;
+	guint8* _tmp23_;
+	gint _tmp23__length1;
+	gsize _tmp24_;
+	SoupBuffer* _tmp25_;
+	SoupMultipart* _tmp26_;
+	SpitPublishingPublishable* _tmp27_;
+	GFile* _tmp28_;
+	GFile* _tmp29_;
+	gchar* _tmp30_;
+	gchar* _tmp31_;
+	const gchar* _tmp32_;
+	SoupBuffer* _tmp33_;
 	SoupMessageHeaders* image_part_header = NULL;
 	SoupBuffer* image_part_body = NULL;
-	SoupMultipart* _tmp35_ = NULL;
-	gint _tmp36_ = 0;
-	SoupMessageHeaders* _tmp37_ = NULL;
-	SoupBuffer* _tmp38_ = NULL;
-	SoupMessageHeaders* _tmp39_ = NULL;
-	GHashTable* _tmp40_ = NULL;
+	SoupMultipart* _tmp34_;
+	gint _tmp35_;
+	SoupMessageHeaders* _tmp36_ = NULL;
+	SoupBuffer* _tmp37_ = NULL;
+	SoupMessageHeaders* _tmp38_;
+	GHashTable* _tmp39_;
 	SoupMessage* outbound_message = NULL;
-	gchar* _tmp41_ = NULL;
-	gchar* _tmp42_ = NULL;
-	SoupMultipart* _tmp43_ = NULL;
-	SoupMessage* _tmp44_ = NULL;
-	SoupMessage* _tmp45_ = NULL;
+	gchar* _tmp40_;
+	gchar* _tmp41_;
+	SoupMultipart* _tmp42_;
+	SoupMessage* _tmp43_;
+	SoupMessage* _tmp44_;
 	GeeMapIterator* i = NULL;
-	GeeHashMap* _tmp46_ = NULL;
-	GeeMapIterator* _tmp47_ = NULL;
+	GeeHashMap* _tmp45_;
+	GeeMapIterator* _tmp46_;
 	gboolean cont = FALSE;
-	GeeMapIterator* _tmp48_ = NULL;
-	gboolean _tmp49_ = FALSE;
-	SoupMessage* _tmp61_ = NULL;
+	GeeMapIterator* _tmp47_;
+	gboolean _tmp48_;
+	SoupMessage* _tmp60_;
 	GError * _inner_error_ = NULL;
 #line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
@@ -4276,7 +4275,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 	_tmp4_ = request_arguments;
 #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4__length1 = request_arguments_length1;
-#line 4272 "RESTSupport.c"
+#line 4271 "RESTSupport.c"
 	{
 		PublishingRESTSupportArgument** arg_collection = NULL;
 		gint arg_collection_length1 = 0;
@@ -4288,20 +4287,20 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 		arg_collection_length1 = _tmp4__length1;
 #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		for (arg_it = 0; arg_it < _tmp4__length1; arg_it = arg_it + 1) {
-#line 4284 "RESTSupport.c"
-			PublishingRESTSupportArgument* _tmp5_ = NULL;
+#line 4283 "RESTSupport.c"
+			PublishingRESTSupportArgument* _tmp5_;
 			PublishingRESTSupportArgument* arg = NULL;
 #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp5_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
 #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			arg = _tmp5_;
-#line 4291 "RESTSupport.c"
+#line 4290 "RESTSupport.c"
 			{
-				SoupMultipart* _tmp6_ = NULL;
-				PublishingRESTSupportArgument* _tmp7_ = NULL;
-				const gchar* _tmp8_ = NULL;
-				PublishingRESTSupportArgument* _tmp9_ = NULL;
-				const gchar* _tmp10_ = NULL;
+				SoupMultipart* _tmp6_;
+				PublishingRESTSupportArgument* _tmp7_;
+				const gchar* _tmp8_;
+				PublishingRESTSupportArgument* _tmp9_;
+				const gchar* _tmp10_;
 #line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp6_ = message_parts;
 #line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4316,16 +4315,16 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 				soup_multipart_append_form_string (_tmp6_, _tmp8_, _tmp10_);
 #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_publishing_rest_support_argument_unref0 (arg);
-#line 4312 "RESTSupport.c"
+#line 4311 "RESTSupport.c"
 			}
 		}
 	}
 	{
-		SpitPublishingPublishable* _tmp11_ = NULL;
-		GFile* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
+		SpitPublishingPublishable* _tmp11_;
+		GFile* _tmp12_;
+		GFile* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
 		gchar* _tmp16_ = NULL;
 		gsize _tmp17_ = 0UL;
 #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4354,7 +4353,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4350 "RESTSupport.c"
+#line 4349 "RESTSupport.c"
 				goto __catch2_g_file_error;
 			}
 #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4369,28 +4368,25 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 			g_clear_error (&_inner_error_);
 #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4365 "RESTSupport.c"
+#line 4364 "RESTSupport.c"
 		}
 	}
 	goto __finally2;
 	__catch2_g_file_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp18_ = NULL;
-		GError* _tmp19_ = NULL;
+		GError* _tmp18_;
 #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		e = _inner_error_;
 #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_inner_error_ = NULL;
 #line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp18_ = _ ("A temporary file needed for publishing is unavailable");
+		_tmp18_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _ ("A temporary file needed for publishing is unavailable"));
 #line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp19_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp18_);
-#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_inner_error_ = _tmp19_;
+		_inner_error_ = _tmp18_;
 #line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (e);
-#line 4386 "RESTSupport.c"
+#line 4382 "RESTSupport.c"
 		goto __finally2;
 	}
 	__finally2:
@@ -4408,7 +4404,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
 #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4404 "RESTSupport.c"
+#line 4400 "RESTSupport.c"
 		} else {
 #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (payload);
@@ -4422,149 +4418,149 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 			g_clear_error (&_inner_error_);
 #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4418 "RESTSupport.c"
+#line 4414 "RESTSupport.c"
 		}
 	}
 #line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp20_ = message_parts;
+	_tmp19_ = message_parts;
 #line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp21_ = soup_multipart_get_length (_tmp20_);
+	_tmp20_ = soup_multipart_get_length (_tmp19_);
 #line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	payload_part_num = _tmp21_;
+	payload_part_num = _tmp20_;
 #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp22_ = payload;
+	_tmp21_ = payload;
 #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp23_ = string_get_data (_tmp22_, &_tmp23__length1);
+	_tmp22_ = string_get_data (_tmp21_, &_tmp22__length1);
 #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp24_ = _tmp23_;
+	_tmp23_ = _tmp22_;
 #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp24__length1 = _tmp23__length1;
+	_tmp23__length1 = _tmp22__length1;
 #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp25_ = payload_length;
+	_tmp24_ = payload_length;
 #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp26_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp24_ + 0, ((gint) _tmp25_) - 0);
+	_tmp25_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp23_ + 0, ((gint) _tmp24_) - 0);
 #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	bindable_data = _tmp26_;
+	bindable_data = _tmp25_;
 #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp27_ = message_parts;
+	_tmp26_ = message_parts;
 #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp28_ = self->publishable;
+	_tmp27_ = self->publishable;
 #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp29_ = spit_publishing_publishable_get_serialized_file (_tmp28_);
+	_tmp28_ = spit_publishing_publishable_get_serialized_file (_tmp27_);
 #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp30_ = _tmp29_;
+	_tmp29_ = _tmp28_;
 #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp31_ = g_file_get_path (_tmp30_);
+	_tmp30_ = g_file_get_path (_tmp29_);
 #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp32_ = _tmp31_;
+	_tmp31_ = _tmp30_;
 #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp33_ = self->mime_type;
+	_tmp32_ = self->mime_type;
 #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp34_ = bindable_data;
+	_tmp33_ = bindable_data;
 #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	soup_multipart_append_form_file (_tmp27_, "", _tmp32_, _tmp33_, _tmp34_);
+	soup_multipart_append_form_file (_tmp26_, "", _tmp31_, _tmp32_, _tmp33_);
 #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp32_);
+	_g_free0 (_tmp31_);
 #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_object_unref0 (_tmp30_);
+	_g_object_unref0 (_tmp29_);
 #line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp35_ = message_parts;
+	_tmp34_ = message_parts;
 #line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp36_ = payload_part_num;
+	_tmp35_ = payload_part_num;
 #line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	soup_multipart_get_part (_tmp35_, _tmp36_, &_tmp37_, &_tmp38_);
+	soup_multipart_get_part (_tmp34_, _tmp35_, &_tmp36_, &_tmp37_);
 #line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	image_part_header = _tmp37_;
+	image_part_header = _tmp36_;
 #line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	image_part_body = _tmp38_;
+	image_part_body = _tmp37_;
 #line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp39_ = image_part_header;
+	_tmp38_ = image_part_header;
 #line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp40_ = self->binary_disposition_table;
+	_tmp39_ = self->binary_disposition_table;
 #line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	soup_message_headers_set_content_disposition (_tmp39_, "form-data", _tmp40_);
+	soup_message_headers_set_content_disposition (_tmp38_, "form-data", _tmp39_);
 #line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp41_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+	_tmp40_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
 #line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp42_ = _tmp41_;
+	_tmp41_ = _tmp40_;
 #line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp43_ = message_parts;
+	_tmp42_ = message_parts;
 #line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp44_ = soup_form_request_new_from_multipart (_tmp42_, _tmp43_);
+	_tmp43_ = soup_form_request_new_from_multipart (_tmp41_, _tmp42_);
 #line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp45_ = _tmp44_;
+	_tmp44_ = _tmp43_;
 #line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp42_);
+	_g_free0 (_tmp41_);
 #line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	outbound_message = _tmp45_;
+	outbound_message = _tmp44_;
 #line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp46_ = self->message_headers;
+	_tmp45_ = self->message_headers;
 #line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp47_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+	_tmp46_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	i = _tmp47_;
+	i = _tmp46_;
 #line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp48_ = i;
+	_tmp47_ = i;
 #line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp49_ = gee_map_iterator_next (_tmp48_);
+	_tmp48_ = gee_map_iterator_next (_tmp47_);
 #line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	cont = _tmp49_;
+	cont = _tmp48_;
 #line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	while (TRUE) {
-#line 4507 "RESTSupport.c"
-		gboolean _tmp50_ = FALSE;
-		SoupMessage* _tmp51_ = NULL;
-		SoupMessageHeaders* _tmp52_ = NULL;
-		GeeMapIterator* _tmp53_ = NULL;
-		gpointer _tmp54_ = NULL;
-		gchar* _tmp55_ = NULL;
-		GeeMapIterator* _tmp56_ = NULL;
-		gpointer _tmp57_ = NULL;
-		gchar* _tmp58_ = NULL;
-		GeeMapIterator* _tmp59_ = NULL;
-		gboolean _tmp60_ = FALSE;
+#line 4503 "RESTSupport.c"
+		gboolean _tmp49_;
+		SoupMessage* _tmp50_;
+		SoupMessageHeaders* _tmp51_;
+		GeeMapIterator* _tmp52_;
+		gpointer _tmp53_;
+		gchar* _tmp54_;
+		GeeMapIterator* _tmp55_;
+		gpointer _tmp56_;
+		gchar* _tmp57_;
+		GeeMapIterator* _tmp58_;
+		gboolean _tmp59_;
 #line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp50_ = cont;
+		_tmp49_ = cont;
 #line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		if (!_tmp50_) {
+		if (!_tmp49_) {
 #line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			break;
-#line 4525 "RESTSupport.c"
+#line 4521 "RESTSupport.c"
 		}
 #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp51_ = outbound_message;
+		_tmp50_ = outbound_message;
 #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp52_ = _tmp51_->request_headers;
+		_tmp51_ = _tmp50_->request_headers;
 #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp53_ = i;
+		_tmp52_ = i;
 #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp54_ = gee_map_iterator_get_key (_tmp53_);
+		_tmp53_ = gee_map_iterator_get_key (_tmp52_);
 #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp55_ = (gchar*) _tmp54_;
+		_tmp54_ = (gchar*) _tmp53_;
 #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp56_ = i;
+		_tmp55_ = i;
 #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp57_ = gee_map_iterator_get_value (_tmp56_);
+		_tmp56_ = gee_map_iterator_get_value (_tmp55_);
 #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp58_ = (gchar*) _tmp57_;
+		_tmp57_ = (gchar*) _tmp56_;
 #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		soup_message_headers_append (_tmp52_, _tmp55_, _tmp58_);
+		soup_message_headers_append (_tmp51_, _tmp54_, _tmp57_);
 #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_free0 (_tmp58_);
+		_g_free0 (_tmp57_);
 #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_free0 (_tmp55_);
+		_g_free0 (_tmp54_);
 #line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp59_ = i;
+		_tmp58_ = i;
 #line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp60_ = gee_map_iterator_next (_tmp59_);
+		_tmp59_ = gee_map_iterator_next (_tmp58_);
 #line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		cont = _tmp60_;
-#line 4555 "RESTSupport.c"
+		cont = _tmp59_;
+#line 4551 "RESTSupport.c"
 	}
 #line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp61_ = outbound_message;
+	_tmp60_ = outbound_message;
 #line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp61_);
+	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp60_);
 #line 534 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
 #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4589,7 +4585,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
 #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4585 "RESTSupport.c"
+#line 4581 "RESTSupport.c"
 		} else {
 #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_object_unref0 (i);
@@ -4609,7 +4605,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 			g_clear_error (&_inner_error_);
 #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4605 "RESTSupport.c"
+#line 4601 "RESTSupport.c"
 		}
 	}
 #line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4624,7 +4620,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 	__vala_SoupMultipart_free0 (message_parts);
 #line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 4620 "RESTSupport.c"
+#line 4616 "RESTSupport.c"
 }
 
 
@@ -4634,10 +4630,10 @@ static void publishing_rest_support_upload_transaction_class_init (PublishingRES
 #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rest_support_upload_transaction_finalize;
 #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->add_header = (void (*)(PublishingRESTSupportTransaction*, const gchar*, const gchar*)) publishing_rest_support_upload_transaction_real_add_header;
+	((PublishingRESTSupportTransactionClass *) klass)->add_header = (void (*) (PublishingRESTSupportTransaction *, const gchar*, const gchar*)) publishing_rest_support_upload_transaction_real_add_header;
 #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*)(PublishingRESTSupportTransaction*, GError**)) publishing_rest_support_upload_transaction_real_execute;
-#line 4633 "RESTSupport.c"
+	((PublishingRESTSupportTransactionClass *) klass)->execute = (void (*) (PublishingRESTSupportTransaction *, GError**)) publishing_rest_support_upload_transaction_real_execute;
+#line 4629 "RESTSupport.c"
 }
 
 
@@ -4648,11 +4644,11 @@ static void publishing_rest_support_upload_transaction_instance_init (Publishing
 	self->publishable = NULL;
 #line 443 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->message_headers = NULL;
-#line 4644 "RESTSupport.c"
+#line 4640 "RESTSupport.c"
 }
 
 
-static void publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) {
+static void publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction * obj) {
 	PublishingRESTSupportUploadTransaction * self;
 #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
@@ -4666,7 +4662,7 @@ static void publishing_rest_support_upload_transaction_finalize (PublishingRESTS
 	_g_object_unref0 (self->message_headers);
 #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rest_support_upload_transaction_parent_class)->finalize (obj);
-#line 4662 "RESTSupport.c"
+#line 4658 "RESTSupport.c"
 }
 
 
@@ -4684,7 +4680,7 @@ GType publishing_rest_support_upload_transaction_get_type (void) {
 
 static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_construct (GType object_type, xmlDoc* doc) {
 	PublishingRESTSupportXmlDocument* self = NULL;
-	xmlDoc* _tmp0_ = NULL;
+	xmlDoc* _tmp0_;
 #line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportXmlDocument*) g_type_create_instance (object_type);
 #line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4693,21 +4689,21 @@ static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_co
 	self->priv->document = _tmp0_;
 #line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 4689 "RESTSupport.c"
+#line 4685 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_new (xmlDoc* doc) {
 #line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_xml_document_construct (PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, doc);
-#line 4696 "RESTSupport.c"
+#line 4692 "RESTSupport.c"
 }
 
 
 xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSupportXmlDocument* self) {
 	xmlNode* result = NULL;
-	xmlDoc* _tmp0_ = NULL;
-	xmlNode* _tmp1_ = NULL;
+	xmlDoc* _tmp0_;
+	xmlNode* _tmp1_;
 #line 555 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
 #line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4718,17 +4714,17 @@ xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSuppo
 	result = _tmp1_;
 #line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 4714 "RESTSupport.c"
+#line 4710 "RESTSupport.c"
 }
 
 
 xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSupportXmlDocument* self, xmlNode* parent, const gchar* child_name, GError** error) {
 	xmlNode* result = NULL;
 	xmlNode* doc_node_iter = NULL;
-	xmlNode* _tmp0_ = NULL;
-	xmlNode* _tmp1_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	GError* _tmp11_ = NULL;
+	xmlNode* _tmp0_;
+	xmlNode* _tmp1_;
+	const gchar* _tmp10_;
+	GError* _tmp11_;
 	GError * _inner_error_ = NULL;
 #line 559 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
@@ -4740,30 +4736,30 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 	_tmp1_ = _tmp0_->children;
 #line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	doc_node_iter = _tmp1_;
-#line 4736 "RESTSupport.c"
+#line 4732 "RESTSupport.c"
 	{
 		gboolean _tmp2_ = FALSE;
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = TRUE;
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		while (TRUE) {
-#line 4743 "RESTSupport.c"
-			xmlNode* _tmp5_ = NULL;
-			xmlNode* _tmp6_ = NULL;
-			const gchar* _tmp7_ = NULL;
-			const gchar* _tmp8_ = NULL;
+#line 4739 "RESTSupport.c"
+			xmlNode* _tmp5_;
+			xmlNode* _tmp6_;
+			const gchar* _tmp7_;
+			const gchar* _tmp8_;
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (!_tmp2_) {
-#line 4750 "RESTSupport.c"
-				xmlNode* _tmp3_ = NULL;
-				xmlNode* _tmp4_ = NULL;
+#line 4746 "RESTSupport.c"
+				xmlNode* _tmp3_;
+				xmlNode* _tmp4_;
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp3_ = doc_node_iter;
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = _tmp3_->next;
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				doc_node_iter = _tmp4_;
-#line 4759 "RESTSupport.c"
+#line 4755 "RESTSupport.c"
 			}
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp2_ = FALSE;
@@ -4773,7 +4769,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 			if (!(_tmp5_ != NULL)) {
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				break;
-#line 4769 "RESTSupport.c"
+#line 4765 "RESTSupport.c"
 			}
 #line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp6_ = doc_node_iter;
@@ -4783,15 +4779,15 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 			_tmp8_ = child_name;
 #line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 4779 "RESTSupport.c"
-				xmlNode* _tmp9_ = NULL;
+#line 4775 "RESTSupport.c"
+				xmlNode* _tmp9_;
 #line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9_ = doc_node_iter;
 #line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				result = _tmp9_;
 #line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return result;
-#line 4787 "RESTSupport.c"
+#line 4783 "RESTSupport.c"
 			}
 		}
 	}
@@ -4807,7 +4803,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 		g_propagate_error (error, _inner_error_);
 #line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return NULL;
-#line 4803 "RESTSupport.c"
+#line 4799 "RESTSupport.c"
 	} else {
 #line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -4815,7 +4811,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 		g_clear_error (&_inner_error_);
 #line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return NULL;
-#line 4811 "RESTSupport.c"
+#line 4807 "RESTSupport.c"
 	}
 }
 
@@ -4823,10 +4819,10 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSupportXmlDocument* self, xmlNode* node, const gchar* property_key, GError** error) {
 	gchar* result = NULL;
 	gchar* value_string = NULL;
-	xmlNode* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
+	xmlNode* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	const gchar* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 572 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
@@ -4844,11 +4840,11 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
 	_tmp3_ = value_string;
 #line 575 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp3_ == NULL) {
-#line 4840 "RESTSupport.c"
-		const gchar* _tmp4_ = NULL;
-		xmlNode* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
+#line 4836 "RESTSupport.c"
+		const gchar* _tmp4_;
+		xmlNode* _tmp5_;
+		const gchar* _tmp6_;
+		GError* _tmp7_;
 #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = property_key;
 #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4867,7 +4863,7 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
 			_g_free0 (value_string);
 #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 4863 "RESTSupport.c"
+#line 4859 "RESTSupport.c"
 		} else {
 #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (value_string);
@@ -4877,93 +4873,93 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
 			g_clear_error (&_inner_error_);
 #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 4873 "RESTSupport.c"
+#line 4869 "RESTSupport.c"
 		}
 	}
 #line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = value_string;
 #line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 4880 "RESTSupport.c"
+#line 4876 "RESTSupport.c"
 }
 
 
 static gchar* string_chug (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1199 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1226 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1228 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1228 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strchug (_tmp1_);
-#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1229 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1229 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 4903 "RESTSupport.c"
+#line 4899 "RESTSupport.c"
 }
 
 
 static gchar* string_chomp (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1191 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1218 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strchomp (_tmp1_);
-#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 4926 "RESTSupport.c"
+#line 4922 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_string (const gchar* input_string, PublishingRESTSupportXmlDocumentCheckForErrorResponse check_for_error_response, void* check_for_error_response_target, GError** error) {
 	PublishingRESTSupportXmlDocument* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp1_;
 	gboolean _tmp6_ = FALSE;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
-	gboolean _tmp13_ = FALSE;
+	const gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	gboolean _tmp12_;
+	gboolean _tmp13_;
 	xmlDoc* doc = NULL;
-	const gchar* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	xmlDoc* _tmp25_ = NULL;
-	xmlDoc* _tmp26_ = NULL;
-	xmlDoc* _tmp28_ = NULL;
-	xmlNode* _tmp29_ = NULL;
+	const gchar* _tmp21_;
+	const gchar* _tmp22_;
+	gint _tmp23_;
+	gint _tmp24_;
+	xmlDoc* _tmp25_;
+	xmlDoc* _tmp26_;
+	xmlDoc* _tmp28_;
+	xmlNode* _tmp29_;
 	PublishingRESTSupportXmlDocument* rest_doc = NULL;
-	xmlDoc* _tmp31_ = NULL;
-	PublishingRESTSupportXmlDocument* _tmp32_ = NULL;
+	xmlDoc* _tmp31_;
+	PublishingRESTSupportXmlDocument* _tmp32_;
 	gchar* _result_ = NULL;
-	PublishingRESTSupportXmlDocumentCheckForErrorResponse _tmp33_ = NULL;
-	void* _tmp33__target = NULL;
-	PublishingRESTSupportXmlDocument* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
-	const gchar* _tmp36_ = NULL;
+	PublishingRESTSupportXmlDocumentCheckForErrorResponse _tmp33_;
+	void* _tmp33__target;
+	PublishingRESTSupportXmlDocument* _tmp34_;
+	gchar* _tmp35_;
+	const gchar* _tmp36_;
 	GError * _inner_error_ = NULL;
 #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = input_string;
@@ -4971,11 +4967,11 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	if (_tmp1_ == NULL) {
 #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = TRUE;
-#line 4967 "RESTSupport.c"
+#line 4963 "RESTSupport.c"
 	} else {
-		const gchar* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		gint _tmp4_ = 0;
+		const gchar* _tmp2_;
+		gint _tmp3_;
+		gint _tmp4_;
 #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = input_string;
 #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4984,12 +4980,12 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 		_tmp4_ = _tmp3_;
 #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _tmp4_ == 0;
-#line 4980 "RESTSupport.c"
+#line 4976 "RESTSupport.c"
 	}
 #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_) {
-#line 4984 "RESTSupport.c"
-		GError* _tmp5_ = NULL;
+#line 4980 "RESTSupport.c"
+		GError* _tmp5_;
 #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Empty XML string");
 #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5000,7 +4996,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_propagate_error (error, _inner_error_);
 #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 4996 "RESTSupport.c"
+#line 4992 "RESTSupport.c"
 		} else {
 #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -5008,7 +5004,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_clear_error (&_inner_error_);
 #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5004 "RESTSupport.c"
+#line 5000 "RESTSupport.c"
 		}
 	}
 #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5033,14 +5029,14 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	if (_tmp13_) {
 #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = TRUE;
-#line 5029 "RESTSupport.c"
+#line 5025 "RESTSupport.c"
 	} else {
-		const gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-		gboolean _tmp19_ = FALSE;
+		const gchar* _tmp14_;
+		gchar* _tmp15_;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
+		gchar* _tmp18_;
+		gboolean _tmp19_;
 #line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp14_ = input_string;
 #line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5059,12 +5055,12 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 		_g_free0 (_tmp18_);
 #line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp16_);
-#line 5055 "RESTSupport.c"
+#line 5051 "RESTSupport.c"
 	}
 #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp6_) {
-#line 5059 "RESTSupport.c"
-		GError* _tmp20_ = NULL;
+#line 5055 "RESTSupport.c"
+		GError* _tmp20_;
 #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp20_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
 #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5075,7 +5071,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_propagate_error (error, _inner_error_);
 #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5071 "RESTSupport.c"
+#line 5067 "RESTSupport.c"
 		} else {
 #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -5083,7 +5079,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_clear_error (&_inner_error_);
 #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5079 "RESTSupport.c"
+#line 5075 "RESTSupport.c"
 		}
 	}
 #line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5102,8 +5098,8 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	_tmp26_ = doc;
 #line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp26_ == NULL) {
-#line 5098 "RESTSupport.c"
-		GError* _tmp27_ = NULL;
+#line 5094 "RESTSupport.c"
+		GError* _tmp27_;
 #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp27_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
 #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5114,7 +5110,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_propagate_error (error, _inner_error_);
 #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5110 "RESTSupport.c"
+#line 5106 "RESTSupport.c"
 		} else {
 #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -5122,7 +5118,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_clear_error (&_inner_error_);
 #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5118 "RESTSupport.c"
+#line 5114 "RESTSupport.c"
 		}
 	}
 #line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5131,8 +5127,8 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	_tmp29_ = _tmp28_->children;
 #line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp29_ == NULL) {
-#line 5127 "RESTSupport.c"
-		GError* _tmp30_ = NULL;
+#line 5123 "RESTSupport.c"
+		GError* _tmp30_;
 #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp30_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
 #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5143,7 +5139,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_propagate_error (error, _inner_error_);
 #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5139 "RESTSupport.c"
+#line 5135 "RESTSupport.c"
 		} else {
 #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -5151,7 +5147,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_clear_error (&_inner_error_);
 #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5147 "RESTSupport.c"
+#line 5143 "RESTSupport.c"
 		}
 	}
 #line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5174,9 +5170,9 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	_tmp36_ = _result_;
 #line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp36_ != NULL) {
-#line 5170 "RESTSupport.c"
-		const gchar* _tmp37_ = NULL;
-		GError* _tmp38_ = NULL;
+#line 5166 "RESTSupport.c"
+		const gchar* _tmp37_;
+		GError* _tmp38_;
 #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp37_ = _result_;
 #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5193,7 +5189,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			_publishing_rest_support_xml_document_unref0 (rest_doc);
 #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5189 "RESTSupport.c"
+#line 5185 "RESTSupport.c"
 		} else {
 #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_result_);
@@ -5205,7 +5201,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_clear_error (&_inner_error_);
 #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5201 "RESTSupport.c"
+#line 5197 "RESTSupport.c"
 		}
 	}
 #line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5214,14 +5210,14 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	_g_free0 (_result_);
 #line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5210 "RESTSupport.c"
+#line 5206 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_xml_document_init (GValue* value) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 5217 "RESTSupport.c"
+#line 5213 "RESTSupport.c"
 }
 
 
@@ -5230,7 +5226,7 @@ static void publishing_rest_support_value_xml_document_free_value (GValue* value
 	if (value->data[0].v_pointer) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_unref (value->data[0].v_pointer);
-#line 5226 "RESTSupport.c"
+#line 5222 "RESTSupport.c"
 	}
 }
 
@@ -5240,11 +5236,11 @@ static void publishing_rest_support_value_xml_document_copy_value (const GValue*
 	if (src_value->data[0].v_pointer) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_xml_document_ref (src_value->data[0].v_pointer);
-#line 5236 "RESTSupport.c"
+#line 5232 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5240 "RESTSupport.c"
+#line 5236 "RESTSupport.c"
 	}
 }
 
@@ -5252,66 +5248,66 @@ static void publishing_rest_support_value_xml_document_copy_value (const GValue*
 static gpointer publishing_rest_support_value_xml_document_peek_pointer (const GValue* value) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 5248 "RESTSupport.c"
+#line 5244 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_xml_document_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 5255 "RESTSupport.c"
-		PublishingRESTSupportXmlDocument* object;
+#line 5251 "RESTSupport.c"
+		PublishingRESTSupportXmlDocument * object;
 		object = collect_values[0].v_pointer;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5262 "RESTSupport.c"
+#line 5258 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 5266 "RESTSupport.c"
+#line 5262 "RESTSupport.c"
 		}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_xml_document_ref (object);
-#line 5270 "RESTSupport.c"
+#line 5266 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5274 "RESTSupport.c"
+#line 5270 "RESTSupport.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 5278 "RESTSupport.c"
+#line 5274 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_xml_document_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingRESTSupportXmlDocument** object_p;
+	PublishingRESTSupportXmlDocument ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!object_p) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5289 "RESTSupport.c"
+#line 5285 "RESTSupport.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 5295 "RESTSupport.c"
+#line 5291 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5299 "RESTSupport.c"
+#line 5295 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5303 "RESTSupport.c"
+#line 5299 "RESTSupport.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 5307 "RESTSupport.c"
+#line 5303 "RESTSupport.c"
 }
 
 
@@ -5325,7 +5321,7 @@ GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 5321 "RESTSupport.c"
+#line 5317 "RESTSupport.c"
 }
 
 
@@ -5334,12 +5330,12 @@ gpointer publishing_rest_support_value_get_xml_document (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT), NULL);
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 5330 "RESTSupport.c"
+#line 5326 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_object) {
-	PublishingRESTSupportXmlDocument* old;
+	PublishingRESTSupportXmlDocument * old;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5354,23 +5350,23 @@ void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_o
 		value->data[0].v_pointer = v_object;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5350 "RESTSupport.c"
+#line 5346 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5354 "RESTSupport.c"
+#line 5350 "RESTSupport.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_unref (old);
-#line 5360 "RESTSupport.c"
+#line 5356 "RESTSupport.c"
 	}
 }
 
 
 void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_object) {
-	PublishingRESTSupportXmlDocument* old;
+	PublishingRESTSupportXmlDocument * old;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5383,17 +5379,17 @@ void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 5379 "RESTSupport.c"
+#line 5375 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5383 "RESTSupport.c"
+#line 5379 "RESTSupport.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_unref (old);
-#line 5389 "RESTSupport.c"
+#line 5385 "RESTSupport.c"
 	}
 }
 
@@ -5405,7 +5401,7 @@ static void publishing_rest_support_xml_document_class_init (PublishingRESTSuppo
 	((PublishingRESTSupportXmlDocumentClass *) klass)->finalize = publishing_rest_support_xml_document_finalize;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRESTSupportXmlDocumentPrivate));
-#line 5401 "RESTSupport.c"
+#line 5397 "RESTSupport.c"
 }
 
 
@@ -5414,13 +5410,13 @@ static void publishing_rest_support_xml_document_instance_init (PublishingRESTSu
 	self->priv = PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_PRIVATE (self);
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 5410 "RESTSupport.c"
+#line 5406 "RESTSupport.c"
 }
 
 
-static void publishing_rest_support_xml_document_finalize (PublishingRESTSupportXmlDocument* obj) {
+static void publishing_rest_support_xml_document_finalize (PublishingRESTSupportXmlDocument * obj) {
 	PublishingRESTSupportXmlDocument * self;
-	xmlDoc* _tmp0_ = NULL;
+	xmlDoc* _tmp0_;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, PublishingRESTSupportXmlDocument);
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5429,7 +5425,7 @@ static void publishing_rest_support_xml_document_finalize (PublishingRESTSupport
 	_tmp0_ = self->priv->document;
 #line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	xmlFreeDoc (_tmp0_);
-#line 5425 "RESTSupport.c"
+#line 5421 "RESTSupport.c"
 }
 
 
@@ -5448,18 +5444,18 @@ GType publishing_rest_support_xml_document_get_type (void) {
 
 
 gpointer publishing_rest_support_xml_document_ref (gpointer instance) {
-	PublishingRESTSupportXmlDocument* self;
+	PublishingRESTSupportXmlDocument * self;
 	self = instance;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 5450 "RESTSupport.c"
+#line 5446 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_xml_document_unref (gpointer instance) {
-	PublishingRESTSupportXmlDocument* self;
+	PublishingRESTSupportXmlDocument * self;
 	self = instance;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -5467,7 +5463,7 @@ void publishing_rest_support_xml_document_unref (gpointer instance) {
 		PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_CLASS (self)->finalize (self);
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5463 "RESTSupport.c"
+#line 5459 "RESTSupport.c"
 	}
 }
 
@@ -5475,13 +5471,13 @@ void publishing_rest_support_xml_document_unref (gpointer instance) {
 gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 	gchar* result = NULL;
 	GString* encoded_str_builder = NULL;
-	GString* _tmp0_ = NULL;
+	GString* _tmp0_;
 	gchar* current_char = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	GString* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
+	GString* _tmp23_;
+	const gchar* _tmp24_;
+	gchar* _tmp25_;
 #line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (source != NULL, NULL);
 #line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5496,18 +5492,18 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 	current_char = _tmp2_;
 #line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	while (TRUE) {
-#line 5492 "RESTSupport.c"
+#line 5488 "RESTSupport.c"
 		gint current_char_value = 0;
-		const gchar* _tmp3_ = NULL;
-		gunichar _tmp4_ = 0U;
-		gint _tmp5_ = 0;
+		const gchar* _tmp3_;
+		gunichar _tmp4_;
+		gint _tmp5_;
 		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
 		gboolean _tmp8_ = FALSE;
-		gint _tmp9_ = 0;
-		const gchar* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
+		gint _tmp9_;
+		const gchar* _tmp20_;
+		const gchar* _tmp21_;
+		gchar* _tmp22_;
 #line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp3_ = current_char;
 #line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5520,58 +5516,58 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 		if (_tmp5_ < 1) {
 #line 633 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			break;
-#line 5516 "RESTSupport.c"
+#line 5512 "RESTSupport.c"
 		}
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp9_ = current_char_value;
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp9_ < 128) {
-#line 5522 "RESTSupport.c"
-			gint _tmp10_ = 0;
+#line 5518 "RESTSupport.c"
+			gint _tmp10_;
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp10_ = current_char_value;
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp8_ = _tmp10_ != ((gint) '&');
-#line 5528 "RESTSupport.c"
+#line 5524 "RESTSupport.c"
 		} else {
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp8_ = FALSE;
-#line 5532 "RESTSupport.c"
+#line 5528 "RESTSupport.c"
 		}
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp8_) {
-#line 5536 "RESTSupport.c"
-			gint _tmp11_ = 0;
+#line 5532 "RESTSupport.c"
+			gint _tmp11_;
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp11_ = current_char_value;
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp7_ = _tmp11_ != ((gint) '<');
-#line 5542 "RESTSupport.c"
+#line 5538 "RESTSupport.c"
 		} else {
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp7_ = FALSE;
-#line 5546 "RESTSupport.c"
+#line 5542 "RESTSupport.c"
 		}
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp7_) {
-#line 5550 "RESTSupport.c"
-			gint _tmp12_ = 0;
+#line 5546 "RESTSupport.c"
+			gint _tmp12_;
 #line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp12_ = current_char_value;
 #line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp6_ = _tmp12_ != ((gint) '>');
-#line 5556 "RESTSupport.c"
+#line 5552 "RESTSupport.c"
 		} else {
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp6_ = FALSE;
-#line 5560 "RESTSupport.c"
+#line 5556 "RESTSupport.c"
 		}
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp6_) {
-#line 5564 "RESTSupport.c"
-			GString* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			gunichar _tmp15_ = 0U;
+#line 5560 "RESTSupport.c"
+			GString* _tmp13_;
+			const gchar* _tmp14_;
+			gunichar _tmp15_;
 #line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp13_ = encoded_str_builder;
 #line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5580,12 +5576,12 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 			_tmp15_ = g_utf8_get_char_validated (_tmp14_, (gssize) -1);
 #line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_string_append_unichar (_tmp13_, _tmp15_);
-#line 5576 "RESTSupport.c"
+#line 5572 "RESTSupport.c"
 		} else {
-			GString* _tmp16_ = NULL;
-			gint _tmp17_ = 0;
-			gchar* _tmp18_ = NULL;
-			gchar* _tmp19_ = NULL;
+			GString* _tmp16_;
+			gint _tmp17_;
+			gchar* _tmp18_;
+			gchar* _tmp19_;
 #line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp16_ = encoded_str_builder;
 #line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5598,7 +5594,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 			g_string_append (_tmp16_, _tmp19_);
 #line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_tmp19_);
-#line 5594 "RESTSupport.c"
+#line 5590 "RESTSupport.c"
 		}
 #line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp20_ = current_char;
@@ -5610,7 +5606,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 		_g_free0 (current_char);
 #line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		current_char = _tmp22_;
-#line 5606 "RESTSupport.c"
+#line 5602 "RESTSupport.c"
 	}
 #line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = encoded_str_builder;
@@ -5626,7 +5622,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 	_g_string_free0 (encoded_str_builder);
 #line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5622 "RESTSupport.c"
+#line 5618 "RESTSupport.c"
 }
 
 
@@ -5637,28 +5633,28 @@ static SpitPublishingPublishable** _vala_array_dup2 (SpitPublishingPublishable**
 	result = g_new0 (SpitPublishingPublishable*, length + 1);
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 5633 "RESTSupport.c"
-		SpitPublishingPublishable* _tmp0_ = NULL;
+#line 5629 "RESTSupport.c"
+		SpitPublishingPublishable* _tmp0_;
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		result[i] = _tmp0_;
-#line 5639 "RESTSupport.c"
+#line 5635 "RESTSupport.c"
 	}
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5643 "RESTSupport.c"
+#line 5639 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable** publishables, int publishables_length1) {
 	PublishingRESTSupportBatchUploader* self = NULL;
-	SpitPublishingPublishable** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	SpitPublishingPublishable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	PublishingRESTSupportSession* _tmp2_ = NULL;
-	PublishingRESTSupportSession* _tmp3_ = NULL;
+	SpitPublishingPublishable** _tmp0_;
+	gint _tmp0__length1;
+	SpitPublishingPublishable** _tmp1_;
+	gint _tmp1__length1;
+	PublishingRESTSupportSession* _tmp2_;
+	PublishingRESTSupportSession* _tmp3_;
 #line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
 #line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5689,22 +5685,22 @@ PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_const
 	self->priv->session = _tmp3_;
 #line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 5685 "RESTSupport.c"
+#line 5681 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted (PublishingRESTSupportTransaction* _sender, gint bytes_written_so_far, gint total_bytes, gpointer self) {
 #line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_batch_uploader_on_chunk_transmitted ((PublishingRESTSupportBatchUploader*) self, bytes_written_so_far, total_bytes);
-#line 5692 "RESTSupport.c"
+#line 5688 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSupportBatchUploader* self) {
 	gboolean stop = FALSE;
-	SpitPublishingPublishable** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gboolean _tmp23_ = FALSE;
+	SpitPublishingPublishable** _tmp0_;
+	gint _tmp0__length1;
+	gboolean _tmp23_;
 	GError * _inner_error_ = NULL;
 #line 663 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self));
@@ -5716,7 +5712,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 	_tmp0_ = self->priv->publishables;
 #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__length1 = self->priv->publishables_length1;
-#line 5712 "RESTSupport.c"
+#line 5708 "RESTSupport.c"
 	{
 		SpitPublishingPublishable** publishable_collection = NULL;
 		gint publishable_collection_length1 = 0;
@@ -5728,36 +5724,36 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 		publishable_collection_length1 = _tmp0__length1;
 #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		for (publishable_it = 0; publishable_it < _tmp0__length1; publishable_it = publishable_it + 1) {
-#line 5724 "RESTSupport.c"
-			SpitPublishingPublishable* _tmp1_ = NULL;
+#line 5720 "RESTSupport.c"
+			SpitPublishingPublishable* _tmp1_;
 			SpitPublishingPublishable* publishable = NULL;
 #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp1_ = _g_object_ref0 (publishable_collection[publishable_it]);
 #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			publishable = _tmp1_;
-#line 5731 "RESTSupport.c"
+#line 5727 "RESTSupport.c"
 			{
 				GFile* file = NULL;
-				SpitPublishingPublishable* _tmp2_ = NULL;
-				GFile* _tmp3_ = NULL;
-				GFile* _tmp4_ = NULL;
+				SpitPublishingPublishable* _tmp2_;
+				GFile* _tmp3_;
+				GFile* _tmp4_;
 				gdouble fraction_complete = 0.0;
-				gint _tmp6_ = 0;
-				SpitPublishingPublishable** _tmp7_ = NULL;
-				gint _tmp7__length1 = 0;
-				SpitPublishingProgressCallback _tmp8_ = NULL;
-				void* _tmp8__target = NULL;
+				gint _tmp6_;
+				SpitPublishingPublishable** _tmp7_;
+				gint _tmp7__length1;
+				SpitPublishingProgressCallback _tmp8_;
+				void* _tmp8__target;
 				PublishingRESTSupportTransaction* txn = NULL;
-				SpitPublishingPublishable** _tmp12_ = NULL;
-				gint _tmp12__length1 = 0;
-				gint _tmp13_ = 0;
-				SpitPublishingPublishable* _tmp14_ = NULL;
-				PublishingRESTSupportTransaction* _tmp15_ = NULL;
-				PublishingRESTSupportTransaction* _tmp16_ = NULL;
-				PublishingRESTSupportTransaction* _tmp19_ = NULL;
-				guint _tmp20_ = 0U;
-				gboolean _tmp21_ = FALSE;
-				gint _tmp22_ = 0;
+				SpitPublishingPublishable** _tmp12_;
+				gint _tmp12__length1;
+				gint _tmp13_;
+				SpitPublishingPublishable* _tmp14_;
+				PublishingRESTSupportTransaction* _tmp15_;
+				PublishingRESTSupportTransaction* _tmp16_;
+				PublishingRESTSupportTransaction* _tmp19_;
+				guint _tmp20_;
+				gboolean _tmp21_;
+				gint _tmp22_;
 #line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp2_ = publishable;
 #line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5768,8 +5764,8 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 				_tmp4_ = file;
 #line 670 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_tmp4_ == NULL) {
-#line 5764 "RESTSupport.c"
-					gint _tmp5_ = 0;
+#line 5760 "RESTSupport.c"
+					gint _tmp5_;
 #line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp5_ = self->priv->current_file;
 #line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5780,7 +5776,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 					_g_object_unref0 (publishable);
 #line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					continue;
-#line 5776 "RESTSupport.c"
+#line 5772 "RESTSupport.c"
 				}
 #line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp6_ = self->priv->current_file;
@@ -5796,11 +5792,11 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 				_tmp8__target = self->priv->status_updated_target;
 #line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_tmp8_ != NULL) {
-#line 5792 "RESTSupport.c"
-					SpitPublishingProgressCallback _tmp9_ = NULL;
-					void* _tmp9__target = NULL;
-					gint _tmp10_ = 0;
-					gdouble _tmp11_ = 0.0;
+#line 5788 "RESTSupport.c"
+					SpitPublishingProgressCallback _tmp9_;
+					void* _tmp9__target;
+					gint _tmp10_;
+					gdouble _tmp11_;
 #line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp9_ = self->priv->status_updated;
 #line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5811,7 +5807,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 					_tmp11_ = fraction_complete;
 #line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp9_ (_tmp10_ + 1, _tmp11_, _tmp9__target);
-#line 5807 "RESTSupport.c"
+#line 5803 "RESTSupport.c"
 				}
 #line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp12_ = self->priv->publishables;
@@ -5829,9 +5825,9 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 				_tmp16_ = txn;
 #line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_signal_connect (_tmp16_, "chunk-transmitted", (GCallback) _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted, self);
-#line 5825 "RESTSupport.c"
+#line 5821 "RESTSupport.c"
 				{
-					PublishingRESTSupportTransaction* _tmp17_ = NULL;
+					PublishingRESTSupportTransaction* _tmp17_;
 #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp17_ = txn;
 #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5840,7 +5836,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5836 "RESTSupport.c"
+#line 5832 "RESTSupport.c"
 							goto __catch3_spit_publishing_publishing_error;
 						}
 #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5855,14 +5851,14 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 						g_clear_error (&_inner_error_);
 #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						return;
-#line 5851 "RESTSupport.c"
+#line 5847 "RESTSupport.c"
 					}
 				}
 				goto __finally3;
 				__catch3_spit_publishing_publishing_error:
 				{
 					GError* err = NULL;
-					GError* _tmp18_ = NULL;
+					GError* _tmp18_;
 #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					err = _inner_error_;
 #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5870,12 +5866,12 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 #line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp18_ = err;
 #line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-					g_signal_emit_by_name (self, "upload-error", _tmp18_);
+					g_signal_emit (self, publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_ERROR_SIGNAL], 0, _tmp18_);
 #line 687 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					stop = TRUE;
 #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_error_free0 (err);
-#line 5871 "RESTSupport.c"
+#line 5867 "RESTSupport.c"
 				}
 				__finally3:
 #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5892,7 +5888,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 					g_clear_error (&_inner_error_);
 #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 5888 "RESTSupport.c"
+#line 5884 "RESTSupport.c"
 				}
 #line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp19_ = txn;
@@ -5912,7 +5908,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 					_g_object_unref0 (publishable);
 #line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 5908 "RESTSupport.c"
+#line 5904 "RESTSupport.c"
 				}
 #line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp22_ = self->priv->current_file;
@@ -5924,7 +5920,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 				_g_object_unref0 (file);
 #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_object_unref0 (publishable);
-#line 5920 "RESTSupport.c"
+#line 5916 "RESTSupport.c"
 			}
 		}
 	}
@@ -5932,31 +5928,31 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 	_tmp23_ = stop;
 #line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!_tmp23_) {
-#line 5928 "RESTSupport.c"
-		gint _tmp24_ = 0;
+#line 5924 "RESTSupport.c"
+		gint _tmp24_;
 #line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp24_ = self->priv->current_file;
 #line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		g_signal_emit_by_name (self, "upload-complete", _tmp24_);
-#line 5934 "RESTSupport.c"
+		g_signal_emit (self, publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_COMPLETE_SIGNAL], 0, _tmp24_);
+#line 5930 "RESTSupport.c"
 	}
 }
 
 
 static void publishing_rest_support_batch_uploader_on_chunk_transmitted (PublishingRESTSupportBatchUploader* self, gint bytes_written_so_far, gint total_bytes) {
 	gdouble file_span = 0.0;
-	SpitPublishingPublishable** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	SpitPublishingPublishable** _tmp0_;
+	gint _tmp0__length1;
 	gdouble this_file_fraction_complete = 0.0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp1_;
+	gint _tmp2_;
 	gdouble fraction_complete = 0.0;
-	gint _tmp3_ = 0;
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
-	SpitPublishingProgressCallback _tmp7_ = NULL;
-	void* _tmp7__target = NULL;
+	gint _tmp3_;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
+	SpitPublishingProgressCallback _tmp7_;
+	void* _tmp7__target;
 #line 702 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self));
 #line 703 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5987,11 +5983,11 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish
 	_tmp7__target = self->priv->status_updated_target;
 #line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 5983 "RESTSupport.c"
-		SpitPublishingProgressCallback _tmp8_ = NULL;
-		void* _tmp8__target = NULL;
-		gint _tmp9_ = 0;
-		gdouble _tmp10_ = 0.0;
+#line 5979 "RESTSupport.c"
+		SpitPublishingProgressCallback _tmp8_;
+		void* _tmp8__target;
+		gint _tmp9_;
+		gdouble _tmp10_;
 #line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp8_ = self->priv->status_updated;
 #line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6002,15 +5998,15 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish
 		_tmp10_ = fraction_complete;
 #line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target);
-#line 5998 "RESTSupport.c"
+#line 5994 "RESTSupport.c"
 	}
 }
 
 
 PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session (PublishingRESTSupportBatchUploader* self) {
 	PublishingRESTSupportSession* result = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingRESTSupportSession* _tmp1_ = NULL;
+	PublishingRESTSupportSession* _tmp0_;
+	PublishingRESTSupportSession* _tmp1_;
 #line 712 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
 #line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6021,17 +6017,17 @@ PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session
 	result = _tmp1_;
 #line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6017 "RESTSupport.c"
+#line 6013 "RESTSupport.c"
 }
 
 
 SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_publishable (PublishingRESTSupportBatchUploader* self) {
 	SpitPublishingPublishable* result = NULL;
-	SpitPublishingPublishable** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gint _tmp1_ = 0;
-	SpitPublishingPublishable* _tmp2_ = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
+	SpitPublishingPublishable** _tmp0_;
+	gint _tmp0__length1;
+	gint _tmp1_;
+	SpitPublishingPublishable* _tmp2_;
+	SpitPublishingPublishable* _tmp3_;
 #line 716 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
 #line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6048,7 +6044,7 @@ SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_pu
 	result = _tmp3_;
 #line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6044 "RESTSupport.c"
+#line 6040 "RESTSupport.c"
 }
 
 
@@ -6057,7 +6053,7 @@ static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_batch_uploader_create_transaction'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6053 "RESTSupport.c"
+#line 6049 "RESTSupport.c"
 }
 
 
@@ -6066,15 +6062,15 @@ PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
 #line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->create_transaction (self, publishable);
-#line 6062 "RESTSupport.c"
+#line 6058 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUploader* self, SpitPublishingProgressCallback status_updated, void* status_updated_target) {
-	SpitPublishingProgressCallback _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
-	SpitPublishingPublishable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	SpitPublishingProgressCallback _tmp0_;
+	void* _tmp0__target;
+	SpitPublishingPublishable** _tmp1_;
+	gint _tmp1__length1;
 #line 722 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self));
 #line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6093,7 +6089,7 @@ void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUp
 	if (_tmp1__length1 > 0) {
 #line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_send_files (self);
-#line 6089 "RESTSupport.c"
+#line 6085 "RESTSupport.c"
 	}
 }
 
@@ -6101,7 +6097,7 @@ void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUp
 static void publishing_rest_support_value_batch_uploader_init (GValue* value) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 6097 "RESTSupport.c"
+#line 6093 "RESTSupport.c"
 }
 
 
@@ -6110,7 +6106,7 @@ static void publishing_rest_support_value_batch_uploader_free_value (GValue* val
 	if (value->data[0].v_pointer) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_unref (value->data[0].v_pointer);
-#line 6106 "RESTSupport.c"
+#line 6102 "RESTSupport.c"
 	}
 }
 
@@ -6120,11 +6116,11 @@ static void publishing_rest_support_value_batch_uploader_copy_value (const GValu
 	if (src_value->data[0].v_pointer) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (src_value->data[0].v_pointer);
-#line 6116 "RESTSupport.c"
+#line 6112 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6120 "RESTSupport.c"
+#line 6116 "RESTSupport.c"
 	}
 }
 
@@ -6132,66 +6128,66 @@ static void publishing_rest_support_value_batch_uploader_copy_value (const GValu
 static gpointer publishing_rest_support_value_batch_uploader_peek_pointer (const GValue* value) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 6128 "RESTSupport.c"
+#line 6124 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_batch_uploader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 6135 "RESTSupport.c"
-		PublishingRESTSupportBatchUploader* object;
+#line 6131 "RESTSupport.c"
+		PublishingRESTSupportBatchUploader * object;
 		object = collect_values[0].v_pointer;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6142 "RESTSupport.c"
+#line 6138 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 6146 "RESTSupport.c"
+#line 6142 "RESTSupport.c"
 		}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (object);
-#line 6150 "RESTSupport.c"
+#line 6146 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6154 "RESTSupport.c"
+#line 6150 "RESTSupport.c"
 	}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6158 "RESTSupport.c"
+#line 6154 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_batch_uploader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingRESTSupportBatchUploader** object_p;
+	PublishingRESTSupportBatchUploader ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!object_p) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6169 "RESTSupport.c"
+#line 6165 "RESTSupport.c"
 	}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 6175 "RESTSupport.c"
+#line 6171 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6179 "RESTSupport.c"
+#line 6175 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6183 "RESTSupport.c"
+#line 6179 "RESTSupport.c"
 	}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6187 "RESTSupport.c"
+#line 6183 "RESTSupport.c"
 }
 
 
@@ -6205,7 +6201,7 @@ GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 6201 "RESTSupport.c"
+#line 6197 "RESTSupport.c"
 }
 
 
@@ -6214,12 +6210,12 @@ gpointer publishing_rest_support_value_get_batch_uploader (const GValue* value)
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER), NULL);
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 6210 "RESTSupport.c"
+#line 6206 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v_object) {
-	PublishingRESTSupportBatchUploader* old;
+	PublishingRESTSupportBatchUploader * old;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6234,23 +6230,23 @@ void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v
 		value->data[0].v_pointer = v_object;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6230 "RESTSupport.c"
+#line 6226 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6234 "RESTSupport.c"
+#line 6230 "RESTSupport.c"
 	}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_unref (old);
-#line 6240 "RESTSupport.c"
+#line 6236 "RESTSupport.c"
 	}
 }
 
 
 void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer v_object) {
-	PublishingRESTSupportBatchUploader* old;
+	PublishingRESTSupportBatchUploader * old;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6263,17 +6259,17 @@ void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 6259 "RESTSupport.c"
+#line 6255 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6263 "RESTSupport.c"
+#line 6259 "RESTSupport.c"
 	}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_unref (old);
-#line 6269 "RESTSupport.c"
+#line 6265 "RESTSupport.c"
 	}
 }
 
@@ -6286,12 +6282,12 @@ static void publishing_rest_support_batch_uploader_class_init (PublishingRESTSup
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRESTSupportBatchUploaderPrivate));
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*)(PublishingRESTSupportBatchUploader*, SpitPublishingPublishable*)) publishing_rest_support_batch_uploader_real_create_transaction;
+	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = (PublishingRESTSupportTransaction* (*) (PublishingRESTSupportBatchUploader *, SpitPublishingPublishable*)) publishing_rest_support_batch_uploader_real_create_transaction;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_new ("upload_complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
+	publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_COMPLETE_SIGNAL] = g_signal_new ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_new ("upload_error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 6287 "RESTSupport.c"
+	publishing_rest_support_batch_uploader_signals[PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_UPLOAD_ERROR_SIGNAL] = g_signal_new ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
+#line 6283 "RESTSupport.c"
 }
 
 
@@ -6310,13 +6306,15 @@ static void publishing_rest_support_batch_uploader_instance_init (PublishingREST
 	self->priv->session = NULL;
 #line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->status_updated = NULL;
+#line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	self->priv->status_updated_target = self;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 6308 "RESTSupport.c"
+#line 6306 "RESTSupport.c"
 }
 
 
-static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
+static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSupportBatchUploader * obj) {
 	PublishingRESTSupportBatchUploader * self;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader);
@@ -6326,7 +6324,7 @@ static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSuppo
 	self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 6322 "RESTSupport.c"
+#line 6320 "RESTSupport.c"
 }
 
 
@@ -6345,18 +6343,18 @@ GType publishing_rest_support_batch_uploader_get_type (void) {
 
 
 gpointer publishing_rest_support_batch_uploader_ref (gpointer instance) {
-	PublishingRESTSupportBatchUploader* self;
+	PublishingRESTSupportBatchUploader * self;
 	self = instance;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 6347 "RESTSupport.c"
+#line 6345 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_batch_uploader_unref (gpointer instance) {
-	PublishingRESTSupportBatchUploader* self;
+	PublishingRESTSupportBatchUploader * self;
 	self = instance;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -6364,39 +6362,39 @@ void publishing_rest_support_batch_uploader_unref (gpointer instance) {
 		PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->finalize (self);
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6360 "RESTSupport.c"
+#line 6358 "RESTSupport.c"
 	}
 }
 
 
 static gunichar string_get_char (const gchar* self, glong index) {
 	gunichar result = 0U;
-	glong _tmp0_ = 0L;
-	gunichar _tmp1_ = 0U;
-#line 1116 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gunichar _tmp1_;
+#line 1140 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0U);
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1141 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 6379 "RESTSupport.c"
+#line 6377 "RESTSupport.c"
 }
 
 
 gchar* publishing_rest_support_asciify_string (const gchar* s) {
 	gchar* result = NULL;
 	gchar* t = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 	GString* b = NULL;
-	GString* _tmp2_ = NULL;
-	GString* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
+	GString* _tmp2_;
+	GString* _tmp14_;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
 #line 733 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (s != NULL, NULL);
 #line 734 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6409,40 +6407,40 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 	_tmp2_ = g_string_new ("");
 #line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	b = _tmp2_;
-#line 6405 "RESTSupport.c"
+#line 6403 "RESTSupport.c"
 	{
 		const gchar* u = NULL;
-		const gchar* _tmp3_ = NULL;
+		const gchar* _tmp3_;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp3_ = t;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		u = _tmp3_;
-#line 6413 "RESTSupport.c"
+#line 6411 "RESTSupport.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp4_ = TRUE;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			while (TRUE) {
-#line 6420 "RESTSupport.c"
-				const gchar* _tmp7_ = NULL;
-				gunichar _tmp8_ = 0U;
+#line 6418 "RESTSupport.c"
+				const gchar* _tmp7_;
+				gunichar _tmp8_;
 				gunichar c = 0U;
-				const gchar* _tmp9_ = NULL;
-				gunichar _tmp10_ = 0U;
-				gunichar _tmp11_ = 0U;
+				const gchar* _tmp9_;
+				gunichar _tmp10_;
+				gunichar _tmp11_;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (!_tmp4_) {
-#line 6429 "RESTSupport.c"
-					const gchar* _tmp5_ = NULL;
-					const gchar* _tmp6_ = NULL;
+#line 6427 "RESTSupport.c"
+					const gchar* _tmp5_;
+					const gchar* _tmp6_;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp5_ = u;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp6_ = g_utf8_next_char (_tmp5_);
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					u = _tmp6_;
-#line 6438 "RESTSupport.c"
+#line 6436 "RESTSupport.c"
 				}
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = FALSE;
@@ -6454,7 +6452,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 				if (!(_tmp8_ != ((gunichar) 0))) {
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 6450 "RESTSupport.c"
+#line 6448 "RESTSupport.c"
 				}
 #line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9_ = u;
@@ -6466,16 +6464,16 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 				_tmp11_ = c;
 #line 739 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (((gint) _tmp11_) < 128) {
-#line 6462 "RESTSupport.c"
-					GString* _tmp12_ = NULL;
-					gunichar _tmp13_ = 0U;
+#line 6460 "RESTSupport.c"
+					GString* _tmp12_;
+					gunichar _tmp13_;
 #line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp12_ = b;
 #line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp13_ = c;
 #line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_string_append_unichar (_tmp12_, _tmp13_);
-#line 6471 "RESTSupport.c"
+#line 6469 "RESTSupport.c"
 				}
 			}
 		}
@@ -6494,7 +6492,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 	_g_free0 (t);
 #line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6490 "RESTSupport.c"
+#line 6488 "RESTSupport.c"
 }
 
 
@@ -6503,7 +6501,7 @@ static gchar* publishing_rest_support_google_session_real_get_user_name (Publish
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_user_name'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6499 "RESTSupport.c"
+#line 6497 "RESTSupport.c"
 }
 
 
@@ -6512,7 +6510,7 @@ gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSuppo
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
 #line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_user_name (self);
-#line 6508 "RESTSupport.c"
+#line 6506 "RESTSupport.c"
 }
 
 
@@ -6521,7 +6519,7 @@ static gchar* publishing_rest_support_google_session_real_get_access_token (Publ
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_access_token'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6517 "RESTSupport.c"
+#line 6515 "RESTSupport.c"
 }
 
 
@@ -6530,7 +6528,7 @@ gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSu
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
 #line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_access_token (self);
-#line 6526 "RESTSupport.c"
+#line 6524 "RESTSupport.c"
 }
 
 
@@ -6539,7 +6537,7 @@ static void publishing_rest_support_google_session_real_deauthenticate (Publishi
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_deauthenticate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 6535 "RESTSupport.c"
+#line 6533 "RESTSupport.c"
 }
 
 
@@ -6548,7 +6546,7 @@ void publishing_rest_support_google_session_deauthenticate (PublishingRESTSuppor
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self));
 #line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->deauthenticate (self);
-#line 6544 "RESTSupport.c"
+#line 6542 "RESTSupport.c"
 }
 
 
@@ -6558,7 +6556,7 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_const
 	self = (PublishingRESTSupportGoogleSession*) publishing_rest_support_session_construct (object_type, NULL);
 #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 6554 "RESTSupport.c"
+#line 6552 "RESTSupport.c"
 }
 
 
@@ -6566,12 +6564,12 @@ static void publishing_rest_support_google_session_class_init (PublishingRESTSup
 #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_session_parent_class = g_type_class_peek_parent (klass);
 #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = (gchar* (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_session_real_get_user_name;
+	((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_session_real_get_user_name;
 #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_session_real_get_access_token;
+	((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_session_real_get_access_token;
 #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = (void (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_session_real_deauthenticate;
-#line 6567 "RESTSupport.c"
+	((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = (void (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_session_real_deauthenticate;
+#line 6565 "RESTSupport.c"
 }
 
 
@@ -6594,19 +6592,19 @@ GType publishing_rest_support_google_session_get_type (void) {
 static void _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) {
 #line 816 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_authenticator_authenticated ((PublishingRESTSupportGooglePublisher*) self);
-#line 6590 "RESTSupport.c"
+#line 6588 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host, const gchar* scope) {
 	PublishingRESTSupportGooglePublisher * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_ = NULL;
-	SpitPublishingService* _tmp3_ = NULL;
-	SpitPublishingPluginHost* _tmp4_ = NULL;
-	SpitPublishingAuthenticator* _tmp5_ = NULL;
-	SpitPublishingAuthenticator* _tmp6_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_;
+	SpitPublishingService* _tmp3_;
+	SpitPublishingPluginHost* _tmp4_;
+	SpitPublishingAuthenticator* _tmp5_;
+	SpitPublishingAuthenticator* _tmp6_;
 #line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
 #line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6649,7 +6647,7 @@ PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_c
 	g_signal_connect_object (_tmp6_, "authenticated", (GCallback) _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated, self, 0);
 #line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 6645 "RESTSupport.c"
+#line 6643 "RESTSupport.c"
 }
 
 
@@ -6658,7 +6656,7 @@ static SpitPublishingAuthenticator* publishing_rest_support_google_publisher_rea
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_get_authenticator'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6654 "RESTSupport.c"
+#line 6652 "RESTSupport.c"
 }
 
 
@@ -6667,13 +6665,13 @@ SpitPublishingAuthenticator* publishing_rest_support_google_publisher_get_authen
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL);
 #line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->get_authenticator (self);
-#line 6663 "RESTSupport.c"
+#line 6661 "RESTSupport.c"
 }
 
 
 SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (PublishingRESTSupportGooglePublisher* self) {
 	SpitPublishingPluginHost* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp0_;
 #line 821 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL);
 #line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6682,14 +6680,14 @@ SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (Pub
 	result = _tmp0_;
 #line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6678 "RESTSupport.c"
+#line 6676 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get_session (PublishingRESTSupportGooglePublisher* self) {
 	PublishingRESTSupportGoogleSession* result = NULL;
-	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp0_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
+	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp0_;
+	PublishingRESTSupportGoogleSession* _tmp1_;
 #line 825 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL);
 #line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6700,7 +6698,7 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get
 	result = _tmp1_;
 #line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6696 "RESTSupport.c"
+#line 6694 "RESTSupport.c"
 }
 
 
@@ -6709,7 +6707,7 @@ static void publishing_rest_support_google_publisher_real_on_login_flow_complete
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_on_login_flow_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 6705 "RESTSupport.c"
+#line 6703 "RESTSupport.c"
 }
 
 
@@ -6718,7 +6716,7 @@ void publishing_rest_support_google_publisher_on_login_flow_complete (Publishing
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
 #line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->on_login_flow_complete (self);
-#line 6714 "RESTSupport.c"
+#line 6712 "RESTSupport.c"
 }
 
 
@@ -6727,7 +6725,7 @@ static void publishing_rest_support_google_publisher_real_do_logout (PublishingR
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_do_logout'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 6723 "RESTSupport.c"
+#line 6721 "RESTSupport.c"
 }
 
 
@@ -6736,7 +6734,7 @@ void publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGo
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
 #line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->do_logout (self);
-#line 6732 "RESTSupport.c"
+#line 6730 "RESTSupport.c"
 }
 
 
@@ -6746,7 +6744,7 @@ static gboolean publishing_rest_support_google_publisher_real_is_running (Publis
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_is_running'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return _tmp0_;
-#line 6742 "RESTSupport.c"
+#line 6740 "RESTSupport.c"
 }
 
 
@@ -6755,7 +6753,7 @@ gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupp
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), FALSE);
 #line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->is_running (self);
-#line 6751 "RESTSupport.c"
+#line 6749 "RESTSupport.c"
 }
 
 
@@ -6764,7 +6762,7 @@ static void publishing_rest_support_google_publisher_real_start (PublishingRESTS
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_start'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 6760 "RESTSupport.c"
+#line 6758 "RESTSupport.c"
 }
 
 
@@ -6773,7 +6771,7 @@ void publishing_rest_support_google_publisher_start (PublishingRESTSupportGoogle
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
 #line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->start (self);
-#line 6769 "RESTSupport.c"
+#line 6767 "RESTSupport.c"
 }
 
 
@@ -6782,7 +6780,7 @@ static void publishing_rest_support_google_publisher_real_stop (PublishingRESTSu
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_stop'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 6778 "RESTSupport.c"
+#line 6776 "RESTSupport.c"
 }
 
 
@@ -6791,15 +6789,15 @@ void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGoogleP
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
 #line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->stop (self);
-#line 6787 "RESTSupport.c"
+#line 6785 "RESTSupport.c"
 }
 
 
 static SpitPublishingService* publishing_rest_support_google_publisher_real_get_service (SpitPublishingPublisher* base) {
 	PublishingRESTSupportGooglePublisher * self;
 	SpitPublishingService* result = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	SpitPublishingService* _tmp1_ = NULL;
+	SpitPublishingService* _tmp0_;
+	SpitPublishingService* _tmp1_;
 #line 839 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher);
 #line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6810,42 +6808,42 @@ static SpitPublishingService* publishing_rest_support_google_publisher_real_get_
 	result = _tmp1_;
 #line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6806 "RESTSupport.c"
+#line 6804 "RESTSupport.c"
 }
 
 
 static gpointer _g_variant_ref0 (gpointer self) {
 #line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? g_variant_ref (self) : NULL;
-#line 6813 "RESTSupport.c"
+#line 6811 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_on_authenticator_authenticated (PublishingRESTSupportGooglePublisher* self) {
 	GHashTable* params = NULL;
-	SpitPublishingAuthenticator* _tmp0_ = NULL;
-	GHashTable* _tmp1_ = NULL;
+	SpitPublishingAuthenticator* _tmp0_;
+	GHashTable* _tmp1_;
 	GVariant* refresh_token = NULL;
 	GVariant* access_token = NULL;
 	GVariant* user_name = NULL;
 	gconstpointer _tmp2_ = NULL;
-	GVariant* _tmp3_ = NULL;
+	GVariant* _tmp3_;
 	gconstpointer _tmp4_ = NULL;
-	GVariant* _tmp5_ = NULL;
+	GVariant* _tmp5_;
 	gconstpointer _tmp6_ = NULL;
-	GVariant* _tmp7_ = NULL;
-	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp8_ = NULL;
-	GVariant* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp12_ = NULL;
-	GVariant* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp16_ = NULL;
-	GVariant* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
+	GVariant* _tmp7_;
+	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp8_;
+	GVariant* _tmp9_;
+	const gchar* _tmp10_;
+	gchar* _tmp11_;
+	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp12_;
+	GVariant* _tmp13_;
+	const gchar* _tmp14_;
+	gchar* _tmp15_;
+	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp16_;
+	GVariant* _tmp17_;
+	const gchar* _tmp18_;
+	gchar* _tmp19_;
 #line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
 #line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6930,7 +6928,7 @@ static void publishing_rest_support_google_publisher_on_authenticator_authentica
 	_g_variant_unref0 (refresh_token);
 #line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_hash_table_unref0 (params);
-#line 6926 "RESTSupport.c"
+#line 6924 "RESTSupport.c"
 }
 
 
@@ -6952,21 +6950,21 @@ static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_su
 	self->refresh_token = NULL;
 #line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 6948 "RESTSupport.c"
+#line 6946 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_new (void) {
 #line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_google_session_impl_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL);
-#line 6955 "RESTSupport.c"
+#line 6953 "RESTSupport.c"
 }
 
 
 static gboolean publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated (PublishingRESTSupportSession* base) {
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 #line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
 #line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6975,16 +6973,16 @@ static gboolean publishing_rest_support_google_publisher_google_session_impl_rea
 	result = _tmp0_ != NULL;
 #line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6971 "RESTSupport.c"
+#line 6969 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_user_name (PublishingRESTSupportGoogleSession* base) {
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 771 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
 #line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6999,16 +6997,16 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
 	result = _tmp2_;
 #line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6995 "RESTSupport.c"
+#line 6993 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_access_token (PublishingRESTSupportGoogleSession* base) {
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
 	gchar* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gboolean _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 776 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
 #line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7023,7 +7021,7 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
 	result = _tmp2_;
 #line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 7019 "RESTSupport.c"
+#line 7017 "RESTSupport.c"
 }
 
 
@@ -7043,7 +7041,7 @@ static void publishing_rest_support_google_publisher_google_session_impl_real_de
 	_g_free0 (self->refresh_token);
 #line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->refresh_token = NULL;
-#line 7039 "RESTSupport.c"
+#line 7037 "RESTSupport.c"
 }
 
 
@@ -7053,14 +7051,14 @@ static void publishing_rest_support_google_publisher_google_session_impl_class_i
 #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_rest_support_google_publisher_google_session_impl_finalize;
 #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*)(PublishingRESTSupportSession*)) publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated;
+	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = (gboolean (*) (PublishingRESTSupportSession *)) publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated;
 #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = (gchar* (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_publisher_google_session_impl_real_get_user_name;
+	((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_publisher_google_session_impl_real_get_user_name;
 #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_publisher_google_session_impl_real_get_access_token;
+	((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = (gchar* (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_publisher_google_session_impl_real_get_access_token;
 #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = (void (*)(PublishingRESTSupportGoogleSession*)) publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate;
-#line 7056 "RESTSupport.c"
+	((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = (void (*) (PublishingRESTSupportGoogleSession *)) publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate;
+#line 7054 "RESTSupport.c"
 }
 
 
@@ -7068,7 +7066,7 @@ static void publishing_rest_support_google_publisher_google_session_impl_instanc
 }
 
 
-static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession* obj) {
+static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession * obj) {
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
 #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
@@ -7080,7 +7078,7 @@ static void publishing_rest_support_google_publisher_google_session_impl_finaliz
 	_g_free0 (self->refresh_token);
 #line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rest_support_google_publisher_google_session_impl_parent_class)->finalize (obj);
-#line 7076 "RESTSupport.c"
+#line 7074 "RESTSupport.c"
 }
 
 
@@ -7098,9 +7096,9 @@ static GType publishing_rest_support_google_publisher_google_session_impl_get_ty
 
 static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
 	PublishingRESTSupportGooglePublisherAuthenticatedTransaction* self = NULL;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp2_ = 0;
+	PublishingRESTSupportGoogleSession* _tmp0_;
+	const gchar* _tmp1_;
+	PublishingRESTSupportHttpMethod _tmp2_;
 #line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
 #line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7115,29 +7113,29 @@ static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_
 	self = (PublishingRESTSupportGooglePublisherAuthenticatedTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
 #line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 7111 "RESTSupport.c"
+#line 7109 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
 #line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method);
-#line 7118 "RESTSupport.c"
+#line 7116 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
 	PublishingRESTSupportGooglePublisherAuthenticatedTransaction* self = NULL;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingRESTSupportHttpMethod _tmp2_ = 0;
-	PublishingRESTSupportGoogleSession* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportGoogleSession* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp0_;
+	const gchar* _tmp1_;
+	PublishingRESTSupportHttpMethod _tmp2_;
+	PublishingRESTSupportGoogleSession* _tmp3_;
+	gboolean _tmp4_;
+	PublishingRESTSupportGoogleSession* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
 #line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
 #line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7174,21 +7172,21 @@ PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_su
 	_g_free0 (_tmp7_);
 #line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 7170 "RESTSupport.c"
+#line 7168 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
 #line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_authenticated_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method);
-#line 7177 "RESTSupport.c"
+#line 7175 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_authenticated_transaction_class_init (PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass * klass) {
 #line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_authenticated_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 7184 "RESTSupport.c"
+#line 7182 "RESTSupport.c"
 }
 
 
@@ -7214,20 +7212,20 @@ static void publishing_rest_support_google_publisher_class_init (PublishingRESTS
 #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRESTSupportGooglePublisherPrivate));
 #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_get_authenticator;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = (SpitPublishingAuthenticator* (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_get_authenticator;
 #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_on_login_flow_complete;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_on_login_flow_complete;
 #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_do_logout;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_do_logout;
 #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = (gboolean (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_is_running;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = (gboolean (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_is_running;
 #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->start = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_start;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->start = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_start;
 #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*)(PublishingRESTSupportGooglePublisher*)) publishing_rest_support_google_publisher_real_stop;
+	((PublishingRESTSupportGooglePublisherClass *) klass)->stop = (void (*) (PublishingRESTSupportGooglePublisher *)) publishing_rest_support_google_publisher_real_stop;
 #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_finalize;
-#line 7223 "RESTSupport.c"
+#line 7221 "RESTSupport.c"
 }
 
 
@@ -7235,25 +7233,25 @@ static void publishing_rest_support_google_publisher_spit_publishing_publisher_i
 #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
 #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_is_running;
+	iface->is_running = (gboolean (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_is_running;
 #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_start;
+	iface->start = (void (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_start;
 #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_stop;
+	iface->stop = (void (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_stop;
 #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_real_get_service;
-#line 7238 "RESTSupport.c"
+	iface->get_service = (SpitPublishingService* (*) (SpitPublishingPublisher *)) publishing_rest_support_google_publisher_real_get_service;
+#line 7236 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_instance_init (PublishingRESTSupportGooglePublisher * self) {
 #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv = PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_PRIVATE (self);
-#line 7245 "RESTSupport.c"
+#line 7243 "RESTSupport.c"
 }
 
 
-static void publishing_rest_support_google_publisher_finalize (GObject* obj) {
+static void publishing_rest_support_google_publisher_finalize (GObject * obj) {
 	PublishingRESTSupportGooglePublisher * self;
 #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher);
@@ -7265,7 +7263,7 @@ static void publishing_rest_support_google_publisher_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->authenticator);
 #line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_OBJECT_CLASS (publishing_rest_support_google_publisher_parent_class)->finalize (obj);
-#line 7261 "RESTSupport.c"
+#line 7259 "RESTSupport.c"
 }
 
 
diff --git a/plugins/common/Resources.c b/plugins/common/Resources.c
index d3b92c0..fa81657 100644
--- a/plugins/common/Resources.c
+++ b/plugins/common/Resources.c
@@ -1,4 +1,4 @@
-/* Resources.c generated by valac 0.34.7, the Vala compiler
+/* Resources.c generated by valac 0.36.6, the Vala compiler
  * generated from Resources.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -47,9 +47,9 @@
 "51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\n"
 #define RESOURCES_TRANSLATORS _ ("translator-credits")
 GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1);
-static void _vala_array_add2 (GdkPixbuf*** array, int* length, int* size, GdkPixbuf* value);
+static void _vala_array_add2 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value);
 GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* result_length1);
-static void _vala_array_add3 (GdkPixbuf*** array, int* length, int* size, GdkPixbuf* value);
+static void _vala_array_add3 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value);
 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);
 
@@ -61,7 +61,7 @@ static gpointer _g_object_ref0 (gpointer self) {
 }
 
 
-static void _vala_array_add2 (GdkPixbuf*** array, int* length, int* size, GdkPixbuf* value) {
+static void _vala_array_add2 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value) {
 #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 	if ((*length) == (*size)) {
 #line 50 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -81,9 +81,9 @@ static void _vala_array_add2 (GdkPixbuf*** array, int* length, int* size, GdkPix
 GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
 	GdkPixbuf** result = NULL;
 	GdkPixbuf* icon = NULL;
-	GdkPixbuf* _tmp10_ = NULL;
-	GdkPixbuf** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
+	GdkPixbuf* _tmp10_;
+	GdkPixbuf** _tmp16_;
+	gint _tmp16__length1;
 	GError * _inner_error_ = NULL;
 #line 40 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 	g_return_val_if_fail ((icon_file == NULL) || G_IS_FILE (icon_file), NULL);
@@ -92,12 +92,12 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
 #line 72 "Resources.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
-		GFile* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		GdkPixbuf* _tmp4_ = NULL;
-		GdkPixbuf* _tmp5_ = NULL;
-		GdkPixbuf* _tmp6_ = NULL;
+		GFile* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		GdkPixbuf* _tmp4_;
+		GdkPixbuf* _tmp5_;
+		GdkPixbuf* _tmp6_;
 #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		_tmp1_ = icon_file;
 #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -133,9 +133,9 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
 	__catch4_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
+		GFile* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		err = _inner_error_;
 #line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -173,15 +173,15 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
 	if (_tmp10_ != NULL) {
 #line 154 "Resources.c"
 		GdkPixbuf** icon_pixbuf_set = NULL;
-		GdkPixbuf** _tmp11_ = NULL;
-		gint icon_pixbuf_set_length1 = 0;
-		gint _icon_pixbuf_set_size_ = 0;
-		GdkPixbuf** _tmp12_ = NULL;
-		gint _tmp12__length1 = 0;
-		GdkPixbuf* _tmp13_ = NULL;
-		GdkPixbuf* _tmp14_ = NULL;
-		GdkPixbuf** _tmp15_ = NULL;
-		gint _tmp15__length1 = 0;
+		GdkPixbuf** _tmp11_;
+		gint icon_pixbuf_set_length1;
+		gint _icon_pixbuf_set_size_;
+		GdkPixbuf** _tmp12_;
+		gint _tmp12__length1;
+		GdkPixbuf* _tmp13_;
+		GdkPixbuf* _tmp14_;
+		GdkPixbuf** _tmp15_;
+		gint _tmp15__length1;
 #line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		_tmp11_ = g_new0 (GdkPixbuf*, 0 + 1);
 #line 49 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -238,7 +238,7 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
 }
 
 
-static void _vala_array_add3 (GdkPixbuf*** array, int* length, int* size, GdkPixbuf* value) {
+static void _vala_array_add3 (GdkPixbuf** * array, int* length, int* size, GdkPixbuf* value) {
 #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 	if ((*length) == (*size)) {
 #line 67 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -258,9 +258,9 @@ static void _vala_array_add3 (GdkPixbuf*** array, int* length, int* size, GdkPix
 GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* result_length1) {
 	GdkPixbuf** result = NULL;
 	GdkPixbuf* icon = NULL;
-	GdkPixbuf* _tmp5_ = NULL;
-	GdkPixbuf** _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
+	GdkPixbuf* _tmp5_;
+	GdkPixbuf** _tmp11_;
+	gint _tmp11__length1;
 	GError * _inner_error_ = NULL;
 #line 57 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 	g_return_val_if_fail (resource_path != NULL, NULL);
@@ -269,9 +269,9 @@ GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* resul
 #line 249 "Resources.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
-		const gchar* _tmp1_ = NULL;
-		GdkPixbuf* _tmp2_ = NULL;
-		GdkPixbuf* _tmp3_ = NULL;
+		const gchar* _tmp1_;
+		GdkPixbuf* _tmp2_;
+		GdkPixbuf* _tmp3_;
 #line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		_tmp1_ = resource_path;
 #line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -299,7 +299,7 @@ GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* resul
 	__catch5_g_error:
 	{
 		GError* _error_ = NULL;
-		const gchar* _tmp4_ = NULL;
+		const gchar* _tmp4_;
 #line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		_error_ = _inner_error_;
 #line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -331,15 +331,15 @@ GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* resul
 	if (_tmp5_ != NULL) {
 #line 312 "Resources.c"
 		GdkPixbuf** icon_pixbuf_set = NULL;
-		GdkPixbuf** _tmp6_ = NULL;
-		gint icon_pixbuf_set_length1 = 0;
-		gint _icon_pixbuf_set_size_ = 0;
-		GdkPixbuf** _tmp7_ = NULL;
-		gint _tmp7__length1 = 0;
-		GdkPixbuf* _tmp8_ = NULL;
-		GdkPixbuf* _tmp9_ = NULL;
-		GdkPixbuf** _tmp10_ = NULL;
-		gint _tmp10__length1 = 0;
+		GdkPixbuf** _tmp6_;
+		gint icon_pixbuf_set_length1;
+		gint _icon_pixbuf_set_size_;
+		GdkPixbuf** _tmp7_;
+		gint _tmp7__length1;
+		GdkPixbuf* _tmp8_;
+		GdkPixbuf* _tmp9_;
+		GdkPixbuf** _tmp10_;
+		gint _tmp10__length1;
 #line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		_tmp6_ = g_new0 (GdkPixbuf*, 0 + 1);
 #line 66 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
diff --git a/plugins/common/WebAuthenticationPane.c b/plugins/common/WebAuthenticationPane.c
index 329f57c..8b6c4c9 100644
--- a/plugins/common/WebAuthenticationPane.c
+++ b/plugins/common/WebAuthenticationPane.c
@@ -1,4 +1,4 @@
-/* WebAuthenticationPane.c generated by valac 0.34.7, the Vala compiler
+/* WebAuthenticationPane.c generated by valac 0.36.6, the Vala compiler
  * generated from WebAuthenticationPane.vala, do not modify */
 
 /* Copyright 2016 Jens Georg <mail@jensge.org>
@@ -48,14 +48,14 @@ struct _ShotwellPluginsCommonWebAuthenticationPanePrivate {
 
 
 static gpointer shotwell_plugins_common_web_authentication_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 
 GType shotwell_plugins_common_web_authentication_pane_get_type (void) G_GNUC_CONST;
 #define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPanePrivate))
 enum  {
 	SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY,
-	SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY,
-	SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI
+	SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY,
+	SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY
 };
 static void shotwell_plugins_common_web_authentication_pane_real_constructed (GObject* base);
 static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self, WebKitLoadEvent load_event);
@@ -75,7 +75,7 @@ static void shotwell_plugins_common_web_authentication_pane_real_on_pane_uninsta
 ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authentication_pane_construct (GType object_type);
 static void shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self, SpitPublishingDialogPaneGeometryOptions value);
 static void shotwell_plugins_common_web_authentication_pane_set_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self, const gchar* value);
-static void shotwell_plugins_common_web_authentication_pane_finalize (GObject* obj);
+static void shotwell_plugins_common_web_authentication_pane_finalize (GObject * obj);
 static void _vala_shotwell_plugins_common_web_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 
@@ -108,11 +108,11 @@ static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender
 
 static void shotwell_plugins_common_web_authentication_pane_real_constructed (GObject* base) {
 	ShotwellPluginsCommonWebAuthenticationPane * self;
-	WebKitWebView* _tmp0_ = NULL;
-	WebKitWebView* _tmp1_ = NULL;
-	WebKitSettings* _tmp2_ = NULL;
-	WebKitWebView* _tmp3_ = NULL;
-	WebKitWebView* _tmp4_ = NULL;
+	WebKitWebView* _tmp0_;
+	WebKitWebView* _tmp1_;
+	WebKitSettings* _tmp2_;
+	WebKitWebView* _tmp3_;
+	WebKitWebView* _tmp4_;
 #line 18 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
 #line 19 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -170,15 +170,15 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self, GdkCursorType type) {
 	GdkWindow* window = NULL;
-	WebKitWebView* _tmp0_ = NULL;
-	GdkWindow* _tmp1_ = NULL;
-	GdkWindow* _tmp2_ = NULL;
+	WebKitWebView* _tmp0_;
+	GdkWindow* _tmp1_;
+	GdkWindow* _tmp2_;
 	GdkDisplay* display = NULL;
-	GdkDisplay* _tmp3_ = NULL;
-	GdkDisplay* _tmp4_ = NULL;
+	GdkDisplay* _tmp3_;
+	GdkDisplay* _tmp4_;
 	GdkCursor* cursor = NULL;
-	GdkCursorType _tmp5_ = 0;
-	GdkCursor* _tmp6_ = NULL;
+	GdkCursorType _tmp5_;
+	GdkCursor* _tmp6_;
 #line 30 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
 #line 31 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -214,7 +214,7 @@ void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPlugins
 
 
 static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self, WebKitLoadEvent load_event) {
-	WebKitLoadEvent _tmp0_ = 0;
+	WebKitLoadEvent _tmp0_;
 #line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
 #line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -257,8 +257,8 @@ static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed
 
 WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self) {
 	WebKitWebView* result = NULL;
-	WebKitWebView* _tmp0_ = NULL;
-	WebKitWebView* _tmp1_ = NULL;
+	WebKitWebView* _tmp0_;
+	WebKitWebView* _tmp1_;
 #line 52 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self), NULL);
 #line 53 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -276,7 +276,7 @@ WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (Shotwel
 static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	ShotwellPluginsCommonWebAuthenticationPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-	SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
+	SpitPublishingDialogPaneGeometryOptions _tmp0_;
 #line 56 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
 #line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -292,8 +292,8 @@ static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authe
 static GtkWidget* shotwell_plugins_common_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	ShotwellPluginsCommonWebAuthenticationPane * self;
 	GtkWidget* result = NULL;
-	WebKitWebView* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	WebKitWebView* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 60 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
 #line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -310,11 +310,11 @@ static GtkWidget* shotwell_plugins_common_web_authentication_pane_real_get_widge
 
 static void shotwell_plugins_common_web_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	ShotwellPluginsCommonWebAuthenticationPane * self;
-	WebKitWebView* _tmp0_ = NULL;
-	WebKitWebView* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	WebKitWebView* _tmp0_;
+	WebKitWebView* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 64 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
 #line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -357,7 +357,7 @@ ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authenti
 
 SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self) {
 	SpitPublishingDialogPaneGeometryOptions result;
-	SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
+	SpitPublishingDialogPaneGeometryOptions _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self), 0);
 #line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -371,23 +371,27 @@ SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authenticati
 
 
 static void shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self, SpitPublishingDialogPaneGeometryOptions value) {
-	SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
 #line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
 #line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	_tmp0_ = value;
+	if (shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (self) != value) {
+#line 379 "WebAuthenticationPane.c"
+		SpitPublishingDialogPaneGeometryOptions _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	self->priv->_preferred_geometry = _tmp0_;
+		_tmp0_ = value;
 #line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	g_object_notify ((GObject *) self, "preferred-geometry");
-#line 384 "WebAuthenticationPane.c"
+		self->priv->_preferred_geometry = _tmp0_;
+#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		g_object_notify ((GObject *) self, "preferred-geometry");
+#line 387 "WebAuthenticationPane.c"
+	}
 }
 
 
 gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self) {
 	gchar* result;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self), NULL);
 #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -398,26 +402,30 @@ gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPl
 	result = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	return result;
-#line 402 "WebAuthenticationPane.c"
+#line 406 "WebAuthenticationPane.c"
 }
 
 
 static void shotwell_plugins_common_web_authentication_pane_set_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self, const gchar* value) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
 #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
 #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	_tmp0_ = value;
+	if (g_strcmp0 (value, shotwell_plugins_common_web_authentication_pane_get_login_uri (self)) != 0) {
+#line 415 "WebAuthenticationPane.c"
+		const gchar* _tmp0_;
+		gchar* _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+		_tmp0_ = value;
 #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	_g_free0 (self->priv->_login_uri);
+		_tmp1_ = g_strdup (_tmp0_);
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+		_g_free0 (self->priv->_login_uri);
 #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	self->priv->_login_uri = _tmp1_;
+		self->priv->_login_uri = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	g_object_notify ((GObject *) self, "login-uri");
-#line 421 "WebAuthenticationPane.c"
+		g_object_notify ((GObject *) self, "login-uri");
+#line 428 "WebAuthenticationPane.c"
+	}
 }
 
 
@@ -427,9 +435,9 @@ static void shotwell_plugins_common_web_authentication_pane_class_init (Shotwell
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_type_class_add_private (klass, sizeof (ShotwellPluginsCommonWebAuthenticationPanePrivate));
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	((GObjectClass *) klass)->constructed = (void (*)(GObject*)) shotwell_plugins_common_web_authentication_pane_real_constructed;
+	((GObjectClass *) klass)->constructed = (void (*) (GObject *)) shotwell_plugins_common_web_authentication_pane_real_constructed;
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*)(ShotwellPluginsCommonWebAuthenticationPane*)) shotwell_plugins_common_web_authentication_pane_real_on_page_load;
+	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = (void (*) (ShotwellPluginsCommonWebAuthenticationPane *)) shotwell_plugins_common_web_authentication_pane_real_on_page_load;
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_shotwell_plugins_common_web_authentication_pane_get_property;
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
@@ -437,10 +445,10 @@ static void shotwell_plugins_common_web_authentication_pane_class_init (Shotwell
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	G_OBJECT_CLASS (klass)->finalize = shotwell_plugins_common_web_authentication_pane_finalize;
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY, g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY, g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI, g_param_spec_string ("login-uri", "login-uri", "login-uri", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-#line 444 "WebAuthenticationPane.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY, g_param_spec_string ("login-uri", "login-uri", "login-uri", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 452 "WebAuthenticationPane.c"
 }
 
 
@@ -448,14 +456,14 @@ static void shotwell_plugins_common_web_authentication_pane_spit_publishing_dial
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry;
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_get_widget;
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_web_authentication_pane_real_get_widget;
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_on_pane_installed;
+	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_web_authentication_pane_real_on_pane_installed;
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled;
-#line 459 "WebAuthenticationPane.c"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled;
+#line 467 "WebAuthenticationPane.c"
 }
 
 
@@ -464,11 +472,11 @@ static void shotwell_plugins_common_web_authentication_pane_instance_init (Shotw
 	self->priv = SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_PRIVATE (self);
 #line 10 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	self->priv->_preferred_geometry = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 468 "WebAuthenticationPane.c"
+#line 476 "WebAuthenticationPane.c"
 }
 
 
-static void shotwell_plugins_common_web_authentication_pane_finalize (GObject* obj) {
+static void shotwell_plugins_common_web_authentication_pane_finalize (GObject * obj) {
 	ShotwellPluginsCommonWebAuthenticationPane * self;
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
@@ -478,7 +486,7 @@ static void shotwell_plugins_common_web_authentication_pane_finalize (GObject* o
 	_g_object_unref0 (self->priv->webview);
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	G_OBJECT_CLASS (shotwell_plugins_common_web_authentication_pane_parent_class)->finalize (obj);
-#line 482 "WebAuthenticationPane.c"
+#line 490 "WebAuthenticationPane.c"
 }
 
 
@@ -502,24 +510,24 @@ static void _vala_shotwell_plugins_common_web_authentication_pane_get_property (
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	switch (property_id) {
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-		case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY:
+		case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY:
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		g_value_set_enum (value, shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (self));
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		break;
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-		case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI:
+		case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY:
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		g_value_take_string (value, shotwell_plugins_common_web_authentication_pane_get_login_uri (self));
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		break;
-#line 517 "WebAuthenticationPane.c"
+#line 525 "WebAuthenticationPane.c"
 		default:
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		break;
-#line 523 "WebAuthenticationPane.c"
+#line 531 "WebAuthenticationPane.c"
 	}
 }
 
@@ -530,24 +538,24 @@ static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	switch (property_id) {
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-		case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY:
+		case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY_PROPERTY:
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (self, g_value_get_enum (value));
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		break;
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-		case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI:
+		case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI_PROPERTY:
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		shotwell_plugins_common_web_authentication_pane_set_login_uri (self, g_value_get_string (value));
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		break;
-#line 545 "WebAuthenticationPane.c"
+#line 553 "WebAuthenticationPane.c"
 		default:
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		break;
-#line 551 "WebAuthenticationPane.c"
+#line 559 "WebAuthenticationPane.c"
 	}
 }