Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4

4 files changed, 1261 insertions, 1311 deletions

diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c
index ec2098d..04da15d 100644
--- a/src/publishing/APIGlue.c
+++ b/src/publishing/APIGlue.c
@@ -1,4 +1,4 @@
-/* APIGlue.c generated by valac 0.34.7, the Vala compiler
+/* APIGlue.c generated by valac 0.36.6, the Vala compiler
  * generated from APIGlue.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -269,7 +269,7 @@ static gpointer publishing_glue_media_source_publishable_wrapper_parent_class =
 static gint publishing_glue_media_source_publishable_wrapper_name_ticker;
 static gint publishing_glue_media_source_publishable_wrapper_name_ticker = 0;
 extern TagSourceCollection* tag_global;
-static SpitPublishingPublishableIface* publishing_glue_media_source_publishable_wrapper_spit_publishing_publishable_parent_iface = NULL;
+static SpitPublishingPublishableIface * publishing_glue_media_source_publishable_wrapper_spit_publishing_publishable_parent_iface = NULL;
 
 GType publishing_glue_media_source_publishable_wrapper_get_type (void) G_GNUC_CONST;
 GType data_object_get_type (void) G_GNUC_CONST;
@@ -312,7 +312,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 gchar* data_object_get_name (DataObject* self);
 GType video_source_get_type (void) G_GNUC_CONST;
 GType video_get_type (void) G_GNUC_CONST;
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
 GFile* media_source_get_file (MediaSource* self);
 void video_export (Video* self, GFile* dest_file, GError** error);
 static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishing_name (SpitPublishingPublishable* base);
@@ -331,13 +331,13 @@ GType database_source_collection_get_type (void) G_GNUC_CONST;
 GType container_source_collection_get_type (void) G_GNUC_CONST;
 GType tag_source_collection_get_type (void) G_GNUC_CONST;
 GeeSortedSet* tag_source_collection_fetch_sorted_for_source (TagSourceCollection* self, MediaSource* photo);
-static void _vala_array_add60 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add60 (gchar** * array, int* length, int* size, gchar* value);
 static gchar** _vala_array_dup22 (gchar** self, int length);
 static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable_wrapper_real_get_media_type (SpitPublishingPublishable* base);
 static GFile* publishing_glue_media_source_publishable_wrapper_real_get_serialized_file (SpitPublishingPublishable* base);
 static GDateTime* publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time (SpitPublishingPublishable* base);
 time_t media_source_get_exposure_time (MediaSource* self);
-static void publishing_glue_media_source_publishable_wrapper_finalize (GObject* obj);
+static void publishing_glue_media_source_publishable_wrapper_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);
 
@@ -351,8 +351,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_construct (GType object_type, MediaSource* to_wrap) {
 	PublishingGlueMediaSourcePublishableWrapper * self = NULL;
-	MediaSource* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
+	MediaSource* _tmp0_;
+	MediaSource* _tmp1_;
 #line 15 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (to_wrap), NULL);
 #line 15 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -381,10 +381,10 @@ PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publis
 
 
 void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMediaSourcePublishableWrapper* self) {
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 20 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	g_return_if_fail (PUBLISHING_GLUE_IS_MEDIA_SOURCE_PUBLISHABLE_WRAPPER (self));
@@ -408,7 +408,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 	_g_free0 (_tmp3_);
 #line 410 "APIGlue.c"
 	{
-		GFile* _tmp4_ = NULL;
+		GFile* _tmp4_;
 #line 27 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp4_ = self->priv->serialized_file;
 #line 27 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -423,9 +423,9 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 	__catch39_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
+		GFile* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
 #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		err = _inner_error_;
 #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -464,22 +464,22 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 
 
 static void publishing_glue_media_source_publishable_wrapper_setup_parameters (PublishingGlueMediaSourcePublishableWrapper* self) {
-	GeeMap* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	GeeMap* _tmp4_ = NULL;
-	MediaSource* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GeeMap* _tmp8_ = NULL;
-	MediaSource* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	MediaSource* _tmp12_ = NULL;
-	Event* _tmp13_ = NULL;
-	Event* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
+	GeeMap* _tmp0_;
+	MediaSource* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	GeeMap* _tmp4_;
+	MediaSource* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	GeeMap* _tmp8_;
+	MediaSource* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	MediaSource* _tmp12_;
+	Event* _tmp13_;
+	Event* _tmp14_;
+	gboolean _tmp15_;
 #line 35 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	g_return_if_fail (PUBLISHING_GLUE_IS_MEDIA_SOURCE_PUBLISHABLE_WRAPPER (self));
 #line 36 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -531,12 +531,12 @@ static void publishing_glue_media_source_publishable_wrapper_setup_parameters (P
 #line 40 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	if (_tmp15_) {
 #line 534 "APIGlue.c"
-		GeeMap* _tmp16_ = NULL;
-		MediaSource* _tmp17_ = NULL;
-		Event* _tmp18_ = NULL;
-		Event* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
+		GeeMap* _tmp16_;
+		MediaSource* _tmp17_;
+		Event* _tmp18_;
+		Event* _tmp19_;
+		gchar* _tmp20_;
+		gchar* _tmp21_;
 #line 41 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp16_ = self->priv->param_string;
 #line 41 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -557,7 +557,7 @@ static void publishing_glue_media_source_publishable_wrapper_setup_parameters (P
 		_g_object_unref0 (_tmp19_);
 #line 559 "APIGlue.c"
 	} else {
-		GeeMap* _tmp22_ = NULL;
+		GeeMap* _tmp22_;
 #line 43 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp22_ = self->priv->param_string;
 #line 43 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -569,9 +569,9 @@ static void publishing_glue_media_source_publishable_wrapper_setup_parameters (P
 
 GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self, gint content_major_axis, gboolean strip_metadata, GError** error) {
 	GFile* result = NULL;
-	MediaSource* _tmp0_ = NULL;
-	GFile* _tmp63_ = NULL;
-	GFile* _tmp64_ = NULL;
+	MediaSource* _tmp0_;
+	GFile* _tmp63_;
+	GFile* _tmp64_;
 	GError * _inner_error_ = NULL;
 #line 46 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	g_return_val_if_fail (PUBLISHING_GLUE_IS_MEDIA_SOURCE_PUBLISHABLE_WRAPPER (self), NULL);
@@ -581,24 +581,24 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO)) {
 #line 583 "APIGlue.c"
 		LibraryPhoto* photo = NULL;
-		MediaSource* _tmp1_ = NULL;
-		LibraryPhoto* _tmp2_ = NULL;
+		MediaSource* _tmp1_;
+		LibraryPhoto* _tmp2_;
 		GFile* to_file = NULL;
-		GFile* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		GFile* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
-		LibraryPhoto* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		GFile* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		GFile* _tmp30_ = NULL;
-		GFile* _tmp31_ = NULL;
+		GFile* _tmp3_;
+		GFile* _tmp4_;
+		gint _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		GFile* _tmp8_;
+		GFile* _tmp9_;
+		LibraryPhoto* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		GFile* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		GFile* _tmp30_;
+		GFile* _tmp31_;
 #line 50 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp1_ = self->priv->wrapped;
 #line 50 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -649,18 +649,18 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 #line 649 "APIGlue.c"
 		{
 			Scaling _tmp16_ = {0};
-			gint _tmp17_ = 0;
+			gint _tmp17_;
 			Scaling scaling = {0};
-			LibraryPhoto* _tmp21_ = NULL;
-			GFile* _tmp22_ = NULL;
-			Scaling _tmp23_ = {0};
-			gboolean _tmp24_ = FALSE;
+			LibraryPhoto* _tmp21_;
+			GFile* _tmp22_;
+			Scaling _tmp23_;
+			gboolean _tmp24_;
 #line 58 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			_tmp17_ = content_major_axis;
 #line 58 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			if (_tmp17_ > 0) {
 #line 662 "APIGlue.c"
-				gint _tmp18_ = 0;
+				gint _tmp18_;
 				Scaling _tmp19_ = {0};
 #line 59 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				_tmp18_ = content_major_axis;
@@ -699,11 +699,11 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 		__catch40_g_error:
 		{
 			GError* err = NULL;
-			LibraryPhoto* _tmp25_ = NULL;
-			gchar* _tmp26_ = NULL;
-			gchar* _tmp27_ = NULL;
-			GError* _tmp28_ = NULL;
-			GError* _tmp29_ = NULL;
+			LibraryPhoto* _tmp25_;
+			gchar* _tmp26_;
+			gchar* _tmp27_;
+			GError* _tmp28_;
+			GError* _tmp29_;
 #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			err = _inner_error_;
 #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -769,39 +769,39 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 		_g_object_unref0 (photo);
 #line 770 "APIGlue.c"
 	} else {
-		MediaSource* _tmp32_ = NULL;
+		MediaSource* _tmp32_;
 #line 67 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp32_ = self->priv->wrapped;
 #line 67 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, TYPE_VIDEO)) {
 #line 777 "APIGlue.c"
 			Video* video = NULL;
-			MediaSource* _tmp33_ = NULL;
-			Video* _tmp34_ = NULL;
+			MediaSource* _tmp33_;
+			Video* _tmp34_;
 			gchar* basename = NULL;
 			gchar* extension = NULL;
-			Video* _tmp35_ = NULL;
-			GFile* _tmp36_ = NULL;
-			GFile* _tmp37_ = NULL;
-			gchar* _tmp38_ = NULL;
-			gchar* _tmp39_ = NULL;
+			Video* _tmp35_;
+			GFile* _tmp36_;
+			GFile* _tmp37_;
+			gchar* _tmp38_;
+			gchar* _tmp39_;
 			gchar* _tmp40_ = NULL;
 			gchar* _tmp41_ = NULL;
 			GFile* to_file = NULL;
-			gint _tmp42_ = 0;
-			const gchar* _tmp43_ = NULL;
-			gchar* _tmp44_ = NULL;
-			gchar* _tmp45_ = NULL;
-			GFile* _tmp46_ = NULL;
-			GFile* _tmp47_ = NULL;
-			Video* _tmp48_ = NULL;
-			gchar* _tmp49_ = NULL;
-			gchar* _tmp50_ = NULL;
-			GFile* _tmp51_ = NULL;
-			gchar* _tmp52_ = NULL;
-			gchar* _tmp53_ = NULL;
-			GFile* _tmp61_ = NULL;
-			GFile* _tmp62_ = NULL;
+			gint _tmp42_;
+			const gchar* _tmp43_;
+			gchar* _tmp44_;
+			gchar* _tmp45_;
+			GFile* _tmp46_;
+			GFile* _tmp47_;
+			Video* _tmp48_;
+			gchar* _tmp49_;
+			gchar* _tmp50_;
+			GFile* _tmp51_;
+			gchar* _tmp52_;
+			gchar* _tmp53_;
+			GFile* _tmp61_;
+			GFile* _tmp62_;
 #line 68 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			_tmp33_ = self->priv->wrapped;
 #line 68 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -871,8 +871,8 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 			_g_free0 (_tmp50_);
 #line 871 "APIGlue.c"
 			{
-				Video* _tmp54_ = NULL;
-				GFile* _tmp55_ = NULL;
+				Video* _tmp54_;
+				GFile* _tmp55_;
 #line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				_tmp54_ = video;
 #line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -889,11 +889,11 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 			__catch41_g_error:
 			{
 				GError* err = NULL;
-				Video* _tmp56_ = NULL;
-				gchar* _tmp57_ = NULL;
-				gchar* _tmp58_ = NULL;
-				GError* _tmp59_ = NULL;
-				GError* _tmp60_ = NULL;
+				Video* _tmp56_;
+				gchar* _tmp57_;
+				gchar* _tmp58_;
+				GError* _tmp59_;
+				GError* _tmp60_;
 #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				err = _inner_error_;
 #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -993,10 +993,10 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	MediaSource* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gboolean _tmp4_;
 #line 94 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1012,8 +1012,8 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	if (_tmp4_) {
 #line 1012 "APIGlue.c"
-		MediaSource* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
+		MediaSource* _tmp5_;
+		gchar* _tmp6_;
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp5_ = self->priv->wrapped;
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1024,7 +1024,7 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi
 		_tmp0_ = _tmp6_;
 #line 1023 "APIGlue.c"
 	} else {
-		gchar* _tmp7_ = NULL;
+		gchar* _tmp7_;
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp7_ = g_strdup ("");
 #line 95 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1044,9 +1044,9 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_publishi
 static gchar* publishing_glue_media_source_publishable_wrapper_real_get_param_string (SpitPublishingPublishable* base, const gchar* name) {
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	gchar* result = NULL;
-	GeeMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
+	GeeMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
 #line 98 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 98 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1065,7 +1065,7 @@ static gchar* publishing_glue_media_source_publishable_wrapper_real_get_param_st
 }
 
 
-static void _vala_array_add60 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add60 (gchar** * array, int* length, int* size, gchar* value) {
 #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	if ((*length) == (*size)) {
 #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1090,7 +1090,7 @@ static gchar** _vala_array_dup22 (gchar** self, int length) {
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	for (i = 0; i < length; i++) {
 #line 1090 "APIGlue.c"
-		gchar* _tmp0_ = NULL;
+		gchar* _tmp0_;
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1107,23 +1107,23 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	gchar** result = NULL;
 	gchar** _result_ = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
+	gchar** _tmp0_;
+	gint _result__length1;
+	gint __result__size_;
 	GeeCollection* tagset = NULL;
-	TagSourceCollection* _tmp1_ = NULL;
-	MediaSource* _tmp2_ = NULL;
-	GeeSortedSet* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
+	TagSourceCollection* _tmp1_;
+	MediaSource* _tmp2_;
+	GeeSortedSet* _tmp3_;
+	GeeCollection* _tmp4_;
 	gchar** _tmp14_ = NULL;
 	gint _tmp14__length1 = 0;
 	gint __tmp14__size_ = 0;
-	gchar** _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	gchar** _tmp17_ = NULL;
-	gint _tmp17__length1 = 0;
-	gchar** _tmp18_ = NULL;
-	gint _tmp18__length1 = 0;
+	gchar** _tmp15_;
+	gint _tmp15__length1;
+	gchar** _tmp17_;
+	gint _tmp17__length1;
+	gchar** _tmp18_;
+	gint _tmp18__length1;
 #line 102 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 103 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1149,8 +1149,8 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 #line 1147 "APIGlue.c"
 		{
 			GeeIterator* _tag_it = NULL;
-			GeeCollection* _tmp5_ = NULL;
-			GeeIterator* _tmp6_ = NULL;
+			GeeCollection* _tmp5_;
+			GeeIterator* _tmp6_;
 #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			_tmp5_ = tagset;
 #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1160,15 +1160,15 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			while (TRUE) {
 #line 1160 "APIGlue.c"
-				GeeIterator* _tmp7_ = NULL;
-				gboolean _tmp8_ = FALSE;
+				GeeIterator* _tmp7_;
+				gboolean _tmp8_;
 				Tag* tag = NULL;
-				GeeIterator* _tmp9_ = NULL;
-				gpointer _tmp10_ = NULL;
-				gchar** _tmp11_ = NULL;
-				gint _tmp11__length1 = 0;
-				Tag* _tmp12_ = NULL;
-				gchar* _tmp13_ = NULL;
+				GeeIterator* _tmp9_;
+				gpointer _tmp10_;
+				gchar** _tmp11_;
+				gint _tmp11__length1;
+				Tag* _tmp12_;
+				gchar* _tmp13_;
 #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				_tmp7_ = _tag_it;
 #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1211,8 +1211,8 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	if (_tmp15__length1 > 0) {
 #line 1211 "APIGlue.c"
-		gchar** _tmp16_ = NULL;
-		gint _tmp16__length1 = 0;
+		gchar** _tmp16_;
+		gint _tmp16__length1;
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp16_ = _result_;
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1262,7 +1262,7 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable_wrapper_real_get_media_type (SpitPublishingPublishable* base) {
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	SpitPublishingPublisherMediaType result = 0;
-	MediaSource* _tmp0_ = NULL;
+	MediaSource* _tmp0_;
 #line 115 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 116 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1275,7 +1275,7 @@ static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable
 		return result;
 #line 1274 "APIGlue.c"
 	} else {
-		MediaSource* _tmp1_ = NULL;
+		MediaSource* _tmp1_;
 #line 118 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		_tmp1_ = self->priv->wrapped;
 #line 118 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1299,8 +1299,8 @@ static SpitPublishingPublisherMediaType publishing_glue_media_source_publishable
 static GFile* publishing_glue_media_source_publishable_wrapper_real_get_serialized_file (SpitPublishingPublishable* base) {
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 124 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 125 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1318,9 +1318,9 @@ static GFile* publishing_glue_media_source_publishable_wrapper_real_get_serializ
 static GDateTime* publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time (SpitPublishingPublishable* base) {
 	PublishingGlueMediaSourcePublishableWrapper * self;
 	GDateTime* result = NULL;
-	MediaSource* _tmp0_ = NULL;
-	time_t _tmp1_ = 0;
-	GDateTime* _tmp2_ = NULL;
+	MediaSource* _tmp0_;
+	time_t _tmp1_;
+	GDateTime* _tmp2_;
 #line 128 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
 #line 129 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1352,23 +1352,23 @@ static void publishing_glue_media_source_publishable_wrapper_spit_publishing_pub
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	publishing_glue_media_source_publishable_wrapper_spit_publishing_publishable_parent_iface = g_type_interface_peek_parent (iface);
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_publishing_name = (gchar* (*)(SpitPublishingPublishable*)) publishing_glue_media_source_publishable_wrapper_real_get_publishing_name;
+	iface->get_publishing_name = (gchar* (*) (SpitPublishingPublishable *)) publishing_glue_media_source_publishable_wrapper_real_get_publishing_name;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_param_string = (gchar* (*)(SpitPublishingPublishable*, const gchar*)) publishing_glue_media_source_publishable_wrapper_real_get_param_string;
+	iface->get_param_string = (gchar* (*) (SpitPublishingPublishable *, const gchar*)) publishing_glue_media_source_publishable_wrapper_real_get_param_string;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_publishing_keywords = (gchar** (*)(SpitPublishingPublishable*, int*)) publishing_glue_media_source_publishable_wrapper_real_get_publishing_keywords;
+	iface->get_publishing_keywords = (gchar** (*) (SpitPublishingPublishable *, int*)) publishing_glue_media_source_publishable_wrapper_real_get_publishing_keywords;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_media_type = (SpitPublishingPublisherMediaType (*)(SpitPublishingPublishable*)) publishing_glue_media_source_publishable_wrapper_real_get_media_type;
+	iface->get_media_type = (SpitPublishingPublisherMediaType (*) (SpitPublishingPublishable *)) publishing_glue_media_source_publishable_wrapper_real_get_media_type;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_serialized_file = (GFile* (*)(SpitPublishingPublishable*)) publishing_glue_media_source_publishable_wrapper_real_get_serialized_file;
+	iface->get_serialized_file = (GFile* (*) (SpitPublishingPublishable *)) publishing_glue_media_source_publishable_wrapper_real_get_serialized_file;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	iface->get_exposure_date_time = (GDateTime* (*)(SpitPublishingPublishable*)) publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time;
+	iface->get_exposure_date_time = (GDateTime* (*) (SpitPublishingPublishable *)) publishing_glue_media_source_publishable_wrapper_real_get_exposure_date_time;
 #line 1364 "APIGlue.c"
 }
 
 
 static void publishing_glue_media_source_publishable_wrapper_instance_init (PublishingGlueMediaSourcePublishableWrapper * self) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self->priv = PUBLISHING_GLUE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER_GET_PRIVATE (self);
 #line 12 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1381,7 +1381,7 @@ static void publishing_glue_media_source_publishable_wrapper_instance_init (Publ
 }
 
 
-static void publishing_glue_media_source_publishable_wrapper_finalize (GObject* obj) {
+static void publishing_glue_media_source_publishable_wrapper_finalize (GObject * obj) {
 	PublishingGlueMediaSourcePublishableWrapper * self;
 #line 8 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_GLUE_TYPE_MEDIA_SOURCE_PUBLISHABLE_WRAPPER, PublishingGlueMediaSourcePublishableWrapper);
diff --git a/src/publishing/Publishing.c b/src/publishing/Publishing.c
index 5ee2728..5ae726a 100644
--- a/src/publishing/Publishing.c
+++ b/src/publishing/Publishing.c
@@ -1,4 +1,4 @@
-/* Publishing.c generated by valac 0.34.7, the Vala compiler
+/* Publishing.c generated by valac 0.36.6, the Vala compiler
  * generated from Publishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -18,10 +18,10 @@
 
 
 void publishing_init (GError** error);
-static void _vala_array_add51 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add52 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add53 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add54 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add51 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add52 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add53 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add54 (gchar** * array, int* length, int* size, gchar* value);
 void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1);
 #define RESOURCES_PUBLISH "applications-internet"
 void publishing_terminate (void);
@@ -29,7 +29,7 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
-static void _vala_array_add51 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add51 (gchar** * array, int* length, int* size, gchar* value) {
 #line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	if ((*length) == (*size)) {
 #line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -46,7 +46,7 @@ static void _vala_array_add51 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add52 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add52 (gchar** * array, int* length, int* size, gchar* value) {
 #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	if ((*length) == (*size)) {
 #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -63,7 +63,7 @@ static void _vala_array_add52 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add53 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add53 (gchar** * array, int* length, int* size, gchar* value) {
 #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	if ((*length) == (*size)) {
 #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -80,7 +80,7 @@ static void _vala_array_add53 (gchar*** array, int* length, int* size, gchar* va
 }
 
 
-static void _vala_array_add54 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add54 (gchar** * array, int* length, int* size, gchar* value) {
 #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	if ((*length) == (*size)) {
 #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -99,24 +99,23 @@ static void _vala_array_add54 (gchar*** array, int* length, int* size, gchar* va
 
 void publishing_init (GError** error) {
 	gchar** core_ids = NULL;
-	gchar** _tmp0_ = NULL;
-	gint core_ids_length1 = 0;
-	gint _core_ids_size_ = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gchar* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar* _tmp4_ = NULL;
-	gchar** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	gchar* _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	gchar** _tmp0_;
+	gint core_ids_length1;
+	gint _core_ids_size_;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
+	gchar* _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
+	gchar** _tmp5_;
+	gint _tmp5__length1;
+	gchar* _tmp6_;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
+	gchar* _tmp8_;
+	gchar** _tmp9_;
+	gint _tmp9__length1;
 #line 10 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp0_ = g_new0 (gchar*, 0 + 1);
 #line 10 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -158,16 +157,14 @@ void publishing_init (GError** error) {
 #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_vala_array_add54 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp8_);
 #line 16 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
-	_tmp9_ = _ ("Publishing");
+	_tmp9_ = core_ids;
 #line 16 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
-	_tmp10_ = core_ids;
+	_tmp9__length1 = core_ids_length1;
 #line 16 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
-	_tmp10__length1 = core_ids_length1;
-#line 16 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
-	plugins_register_extension_point (SPIT_PUBLISHING_TYPE_SERVICE, _tmp9_, RESOURCES_PUBLISH, _tmp10_, _tmp10__length1);
+	plugins_register_extension_point (SPIT_PUBLISHING_TYPE_SERVICE, _ ("Publishing"), RESOURCES_PUBLISH, _tmp9_, _tmp9__length1);
 #line 9 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	core_ids = (_vala_array_free (core_ids, core_ids_length1, (GDestroyNotify) g_free), NULL);
-#line 171 "Publishing.c"
+#line 168 "Publishing.c"
 }
 
 
diff --git a/src/publishing/PublishingPluginHost.c b/src/publishing/PublishingPluginHost.c
index 63e16c4..54f1495 100644
--- a/src/publishing/PublishingPluginHost.c
+++ b/src/publishing/PublishingPluginHost.c
@@ -1,4 +1,4 @@
-/* PublishingPluginHost.c generated by valac 0.34.7, the Vala compiler
+/* PublishingPluginHost.c generated by valac 0.36.6, the Vala compiler
  * generated from PublishingPluginHost.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -166,7 +166,7 @@ struct _SpitPublishingConcretePublishingHostPrivate {
 
 
 static gpointer spit_publishing_concrete_publishing_host_parent_class = NULL;
-static SpitPublishingPluginHostIface* spit_publishing_concrete_publishing_host_spit_publishing_plugin_host_parent_iface = NULL;
+static SpitPublishingPluginHostIface * spit_publishing_concrete_publishing_host_spit_publishing_plugin_host_parent_iface = NULL;
 
 GType plugins_standard_host_interface_get_type (void) G_GNUC_CONST;
 GType spit_publishing_concrete_publishing_host_get_type (void) G_GNUC_CONST;
@@ -238,7 +238,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 void spin_event_loop (void);
 GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing (PublishingGlueMediaSourcePublishableWrapper* self, gint content_major_axis, gboolean strip_metadata, GError** error);
 static void _spit_publishing_concrete_publishing_host_report_plugin_upload_progress_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
-static void spit_publishing_concrete_publishing_host_finalize (GObject* obj);
+static void spit_publishing_concrete_publishing_host_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);
 
@@ -258,7 +258,7 @@ static SpitPublishingPublishable** _vala_array_dup20 (SpitPublishingPublishable*
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	for (i = 0; i < length; i++) {
 #line 261 "PublishingPluginHost.c"
-		SpitPublishingPublishable* _tmp0_ = NULL;
+		SpitPublishingPublishable* _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -273,16 +273,16 @@ static SpitPublishingPublishable** _vala_array_dup20 (SpitPublishingPublishable*
 
 SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_construct (GType object_type, SpitPublishingService* service, PublishingUIPublishingDialog* dialog, SpitPublishingPublishable** publishables, int publishables_length1) {
 	SpitPublishingConcretePublishingHost * self = NULL;
-	SpitPublishingService* _tmp0_ = NULL;
-	PublishingUIPublishingDialog* _tmp1_ = NULL;
-	SpitPublishingPublishable** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	SpitPublishingPublishable** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	SpitPublishingPublishable** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	SpitPublishingService* _tmp9_ = NULL;
-	SpitPublishingPublisher* _tmp10_ = NULL;
+	SpitPublishingService* _tmp0_;
+	PublishingUIPublishingDialog* _tmp1_;
+	SpitPublishingPublishable** _tmp2_;
+	gint _tmp2__length1;
+	SpitPublishingPublishable** _tmp3_;
+	gint _tmp3__length1;
+	SpitPublishingPublishable** _tmp4_;
+	gint _tmp4__length1;
+	SpitPublishingService* _tmp9_;
+	SpitPublishingPublisher* _tmp10_;
 #line 24 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
 #line 24 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -328,7 +328,7 @@ SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_c
 #line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		for (curr_publishable_it = 0; curr_publishable_it < _tmp4__length1; curr_publishable_it = curr_publishable_it + 1) {
 #line 331 "PublishingPluginHost.c"
-			SpitPublishingPublishable* _tmp5_ = NULL;
+			SpitPublishingPublishable* _tmp5_;
 			SpitPublishingPublishable* curr_publishable = NULL;
 #line 30 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 			_tmp5_ = _g_object_ref0 (curr_publishable_collection[curr_publishable_it]);
@@ -336,9 +336,9 @@ SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_c
 			curr_publishable = _tmp5_;
 #line 338 "PublishingPluginHost.c"
 			{
-				SpitPublishingPublisherMediaType _tmp6_ = 0;
-				SpitPublishingPublishable* _tmp7_ = NULL;
-				SpitPublishingPublisherMediaType _tmp8_ = 0;
+				SpitPublishingPublisherMediaType _tmp6_;
+				SpitPublishingPublishable* _tmp7_;
+				SpitPublishingPublisherMediaType _tmp8_;
 #line 31 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 				_tmp6_ = self->priv->media_type;
 #line 31 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -375,8 +375,8 @@ SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_n
 
 
 static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPublishingConcretePublishingHost* self) {
-	SpitPublishingLoginCallback _tmp0_ = NULL;
-	void* _tmp0__target = NULL;
+	SpitPublishingLoginCallback _tmp0_;
+	void* _tmp0__target;
 #line 36 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
 #line 37 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -386,8 +386,8 @@ static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPubli
 #line 37 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	if (_tmp0_ != NULL) {
 #line 389 "PublishingPluginHost.c"
-		SpitPublishingLoginCallback _tmp1_ = NULL;
-		void* _tmp1__target = NULL;
+		SpitPublishingLoginCallback _tmp1_;
+		void* _tmp1__target;
 #line 38 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp1_ = self->priv->current_login_callback;
 #line 38 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -400,8 +400,8 @@ static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPubli
 
 
 static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingConcretePublishingHost* self) {
-	SpitPublishingPublishable** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	SpitPublishingPublishable** _tmp0_;
+	gint _tmp0__length1;
 #line 41 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
 #line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -421,7 +421,7 @@ static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingCon
 #line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		for (publishable_it = 0; publishable_it < _tmp0__length1; publishable_it = publishable_it + 1) {
 #line 424 "PublishingPluginHost.c"
-			SpitPublishingPublishable* _tmp1_ = NULL;
+			SpitPublishingPublishable* _tmp1_;
 			SpitPublishingPublishable* publishable = NULL;
 #line 42 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 			_tmp1_ = _g_object_ref0 (publishable_collection[publishable_it]);
@@ -429,7 +429,7 @@ static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingCon
 			publishable = _tmp1_;
 #line 431 "PublishingPluginHost.c"
 			{
-				SpitPublishingPublishable* _tmp2_ = NULL;
+				SpitPublishingPublishable* _tmp2_;
 #line 43 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 				_tmp2_ = publishable;
 #line 43 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -444,23 +444,23 @@ static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingCon
 
 
 static void spit_publishing_concrete_publishing_host_report_plugin_upload_progress (SpitPublishingConcretePublishingHost* self, gint file_number, gdouble fraction_complete) {
-	PublishingUIPublishingDialog* _tmp0_ = NULL;
-	SpitPublishingDialogPane* _tmp1_ = NULL;
-	SpitPublishingDialogPane* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	PublishingUIPublishingDialog* _tmp0_;
+	SpitPublishingDialogPane* _tmp1_;
+	SpitPublishingDialogPane* _tmp2_;
+	gboolean _tmp3_;
 	PublishingUIProgressPane* pane = NULL;
-	PublishingUIPublishingDialog* _tmp4_ = NULL;
-	SpitPublishingDialogPane* _tmp5_ = NULL;
+	PublishingUIPublishingDialog* _tmp4_;
+	SpitPublishingDialogPane* _tmp5_;
 	gchar* status_string = NULL;
-	gint _tmp6_ = 0;
-	SpitPublishingPublishable** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	gchar* _tmp8_ = NULL;
+	gint _tmp6_;
+	SpitPublishingPublishable** _tmp7_;
+	gint _tmp7__length1;
+	gchar* _tmp8_;
 	gdouble status_fraction = 0.0;
-	gdouble _tmp9_ = 0.0;
-	PublishingUIProgressPane* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gdouble _tmp12_ = 0.0;
+	gdouble _tmp9_;
+	PublishingUIProgressPane* _tmp10_;
+	const gchar* _tmp11_;
+	gdouble _tmp12_;
 #line 46 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
 #line 48 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -517,8 +517,8 @@ static void spit_publishing_concrete_publishing_host_report_plugin_upload_progre
 
 static void spit_publishing_concrete_publishing_host_install_progress_pane (SpitPublishingConcretePublishingHost* self) {
 	PublishingUIProgressPane* progress_pane = NULL;
-	PublishingUIProgressPane* _tmp0_ = NULL;
-	PublishingUIPublishingDialog* _tmp1_ = NULL;
+	PublishingUIProgressPane* _tmp0_;
+	PublishingUIPublishingDialog* _tmp1_;
 #line 61 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
 #line 62 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -540,10 +540,10 @@ static void spit_publishing_concrete_publishing_host_install_progress_pane (Spit
 static void spit_publishing_concrete_publishing_host_real_install_dialog_pane (SpitPublishingPluginHost* base, SpitPublishingDialogPane* pane, SpitPublishingPluginHostButtonMode button_mode) {
 	SpitPublishingConcretePublishingHost * self;
 	gboolean _tmp0_ = FALSE;
-	SpitPublishingPublisher* _tmp1_ = NULL;
-	PublishingUIPublishingDialog* _tmp4_ = NULL;
-	SpitPublishingDialogPane* _tmp5_ = NULL;
-	SpitPublishingPluginHostButtonMode _tmp6_ = 0;
+	SpitPublishingPublisher* _tmp1_;
+	PublishingUIPublishingDialog* _tmp4_;
+	SpitPublishingDialogPane* _tmp5_;
+	SpitPublishingPluginHostButtonMode _tmp6_;
 #line 68 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 68 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -559,8 +559,8 @@ static void spit_publishing_concrete_publishing_host_real_install_dialog_pane (S
 		_tmp0_ = TRUE;
 #line 560 "PublishingPluginHost.c"
 	} else {
-		SpitPublishingPublisher* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+		SpitPublishingPublisher* _tmp2_;
+		gboolean _tmp3_;
 #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp2_ = self->priv->active_publisher;
 #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -592,113 +592,107 @@ static void spit_publishing_concrete_publishing_host_real_install_dialog_pane (S
 static void spit_publishing_concrete_publishing_host_real_post_error (SpitPublishingPluginHost* base, GError* err) {
 	SpitPublishingConcretePublishingHost * self;
 	gchar* msg = NULL;
-	const gchar* _tmp0_ = NULL;
-	SpitPublishingPublisher* _tmp1_ = NULL;
-	SpitPublishingService* _tmp2_ = NULL;
-	SpitPublishingService* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	GError* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	PublishingUIPublishingDialog* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-	PublishingUIStaticMessagePane* _tmp18_ = NULL;
-	PublishingUIStaticMessagePane* _tmp19_ = NULL;
-	PublishingUIPublishingDialog* _tmp20_ = NULL;
-	PublishingUIPublishingDialog* _tmp21_ = NULL;
-	SpitPublishingPublisher* _tmp22_ = NULL;
+	SpitPublishingPublisher* _tmp0_;
+	SpitPublishingService* _tmp1_;
+	SpitPublishingService* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	const gchar* _tmp6_;
+	GError* _tmp7_;
+	const gchar* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	gchar* _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
+	PublishingUIPublishingDialog* _tmp14_;
+	const gchar* _tmp15_;
+	PublishingUIStaticMessagePane* _tmp16_;
+	PublishingUIStaticMessagePane* _tmp17_;
+	PublishingUIPublishingDialog* _tmp18_;
+	PublishingUIPublishingDialog* _tmp19_;
+	SpitPublishingPublisher* _tmp20_;
 #line 80 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp0_ = _ ("Publishing to %s can’t continue because an error occurred:");
-#line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp1_ = self->priv->active_publisher;
+	_tmp0_ = self->priv->active_publisher;
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp2_ = spit_publishing_publisher_get_service (_tmp1_);
+	_tmp1_ = spit_publishing_publisher_get_service (_tmp0_);
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp4_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+	_tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp5_ = g_strdup_printf (_tmp0_, _tmp4_);
+	_tmp4_ = g_strdup_printf (_ ("Publishing to %s can’t continue because an error occurred:"), _tmp3_);
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_g_object_unref0 (_tmp3_);
+	_g_object_unref0 (_tmp2_);
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	msg = _tmp6_;
+	msg = _tmp5_;
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp7_ = msg;
+	_tmp6_ = msg;
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp8_ = err;
+	_tmp7_ = err;
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp9_ = _tmp8_->message;
+	_tmp8_ = _tmp7_->message;
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp10_ = g_markup_printf_escaped ("\n\n<i>%s</i>\n\n", _tmp9_);
+	_tmp9_ = g_markup_printf_escaped ("\n\n<i>%s</i>\n\n", _tmp8_);
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp11_ = _tmp10_;
+	_tmp10_ = _tmp9_;
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp12_ = g_strconcat (_tmp7_, _tmp11_, NULL);
+	_tmp11_ = g_strconcat (_tmp6_, _tmp10_, NULL);
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_g_free0 (msg);
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	msg = _tmp12_;
+	msg = _tmp11_;
 #line 83 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_g_free0 (_tmp11_);
-#line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp13_ = msg;
+	_g_free0 (_tmp10_);
 #line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp14_ = _ ("To try publishing to another service, select one from the above menu.");
+	_tmp12_ = msg;
 #line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp15_ = g_strconcat (_tmp13_, _tmp14_, NULL);
+	_tmp13_ = g_strconcat (_tmp12_, _ ("To try publishing to another service, select one from the above menu."), NULL);
 #line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_g_free0 (msg);
 #line 84 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	msg = _tmp15_;
+	msg = _tmp13_;
 #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp16_ = self->priv->dialog;
+	_tmp14_ = self->priv->dialog;
 #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp17_ = msg;
+	_tmp15_ = msg;
 #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp18_ = publishing_ui_static_message_pane_new (_tmp17_, TRUE);
+	_tmp16_ = publishing_ui_static_message_pane_new (_tmp15_, TRUE);
 #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp19_ = _tmp18_;
+	_tmp17_ = _tmp16_;
 #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	publishing_ui_publishing_dialog_install_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
+	publishing_ui_publishing_dialog_install_pane (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
 #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_g_object_unref0 (_tmp19_);
+	_g_object_unref0 (_tmp17_);
 #line 87 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp20_ = self->priv->dialog;
+	_tmp18_ = self->priv->dialog;
 #line 87 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	publishing_ui_publishing_dialog_set_close_button_mode (_tmp20_);
+	publishing_ui_publishing_dialog_set_close_button_mode (_tmp18_);
 #line 88 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp21_ = self->priv->dialog;
+	_tmp19_ = self->priv->dialog;
 #line 88 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	publishing_ui_publishing_dialog_unlock_service (_tmp21_);
+	publishing_ui_publishing_dialog_unlock_service (_tmp19_);
 #line 90 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp22_ = self->priv->active_publisher;
+	_tmp20_ = self->priv->active_publisher;
 #line 90 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	spit_publishing_publisher_stop (_tmp22_);
+	spit_publishing_publisher_stop (_tmp20_);
 #line 95 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	spit_publishing_concrete_publishing_host_clean_up (self);
 #line 80 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_g_free0 (msg);
-#line 694 "PublishingPluginHost.c"
+#line 688 "PublishingPluginHost.c"
 }
 
 
 static void spit_publishing_concrete_publishing_host_real_stop_publishing (SpitPublishingPluginHost* base) {
 	SpitPublishingConcretePublishingHost * self;
-	SpitPublishingPublisher* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	SpitPublishingPublisher* _tmp0_;
+	gboolean _tmp1_;
 #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 99 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -710,26 +704,26 @@ static void spit_publishing_concrete_publishing_host_real_stop_publishing (SpitP
 	_tmp1_ = spit_publishing_publisher_is_running (_tmp0_);
 #line 101 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	if (_tmp1_) {
-#line 712 "PublishingPluginHost.c"
-		SpitPublishingPublisher* _tmp2_ = NULL;
+#line 706 "PublishingPluginHost.c"
+		SpitPublishingPublisher* _tmp2_;
 #line 102 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp2_ = self->priv->active_publisher;
 #line 102 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		spit_publishing_publisher_stop (_tmp2_);
-#line 718 "PublishingPluginHost.c"
+#line 712 "PublishingPluginHost.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	spit_publishing_concrete_publishing_host_clean_up (self);
 #line 106 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self->priv->publishing_halted = TRUE;
-#line 724 "PublishingPluginHost.c"
+#line 718 "PublishingPluginHost.c"
 }
 
 
 void spit_publishing_concrete_publishing_host_start_publishing (SpitPublishingConcretePublishingHost* self) {
-	SpitPublishingPublisher* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	SpitPublishingPublisher* _tmp2_ = NULL;
+	SpitPublishingPublisher* _tmp0_;
+	gboolean _tmp1_;
+	SpitPublishingPublisher* _tmp2_;
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
 #line 110 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -740,7 +734,7 @@ void spit_publishing_concrete_publishing_host_start_publishing (SpitPublishingCo
 	if (_tmp1_) {
 #line 111 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		return;
-#line 742 "PublishingPluginHost.c"
+#line 736 "PublishingPluginHost.c"
 	}
 #line 113 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	g_debug ("PublishingPluginHost.vala:113: ConcretePublishingHost.start_publishing" \
@@ -749,15 +743,15 @@ void spit_publishing_concrete_publishing_host_start_publishing (SpitPublishingCo
 	_tmp2_ = self->priv->active_publisher;
 #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	spit_publishing_publisher_start (_tmp2_);
-#line 750 "PublishingPluginHost.c"
+#line 744 "PublishingPluginHost.c"
 }
 
 
 static SpitPublishingPublisher* spit_publishing_concrete_publishing_host_real_get_publisher (SpitPublishingPluginHost* base) {
 	SpitPublishingConcretePublishingHost * self;
 	SpitPublishingPublisher* result = NULL;
-	SpitPublishingPublisher* _tmp0_ = NULL;
-	SpitPublishingPublisher* _tmp1_ = NULL;
+	SpitPublishingPublisher* _tmp0_;
+	SpitPublishingPublisher* _tmp1_;
 #line 118 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 119 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -768,17 +762,17 @@ static SpitPublishingPublisher* spit_publishing_concrete_publishing_host_real_ge
 	result = _tmp1_;
 #line 119 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	return result;
-#line 769 "PublishingPluginHost.c"
+#line 763 "PublishingPluginHost.c"
 }
 
 
 static void spit_publishing_concrete_publishing_host_real_install_static_message_pane (SpitPublishingPluginHost* base, const gchar* message, SpitPublishingPluginHostButtonMode button_mode) {
 	SpitPublishingConcretePublishingHost * self;
-	SpitPublishingPluginHostButtonMode _tmp0_ = 0;
-	PublishingUIPublishingDialog* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingUIStaticMessagePane* _tmp3_ = NULL;
-	PublishingUIStaticMessagePane* _tmp4_ = NULL;
+	SpitPublishingPluginHostButtonMode _tmp0_;
+	PublishingUIPublishingDialog* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingUIStaticMessagePane* _tmp3_;
+	PublishingUIStaticMessagePane* _tmp4_;
 #line 122 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 122 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -799,17 +793,17 @@ static void spit_publishing_concrete_publishing_host_real_install_static_message
 	publishing_ui_publishing_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
 #line 127 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_g_object_unref0 (_tmp4_);
-#line 800 "PublishingPluginHost.c"
+#line 794 "PublishingPluginHost.c"
 }
 
 
 static void spit_publishing_concrete_publishing_host_real_install_pango_message_pane (SpitPublishingPluginHost* base, const gchar* markup, SpitPublishingPluginHostButtonMode button_mode) {
 	SpitPublishingConcretePublishingHost * self;
-	SpitPublishingPluginHostButtonMode _tmp0_ = 0;
-	PublishingUIPublishingDialog* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingUIStaticMessagePane* _tmp3_ = NULL;
-	PublishingUIStaticMessagePane* _tmp4_ = NULL;
+	SpitPublishingPluginHostButtonMode _tmp0_;
+	PublishingUIPublishingDialog* _tmp1_;
+	const gchar* _tmp2_;
+	PublishingUIStaticMessagePane* _tmp3_;
+	PublishingUIStaticMessagePane* _tmp4_;
 #line 130 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 130 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -830,19 +824,19 @@ static void spit_publishing_concrete_publishing_host_real_install_pango_message_
 	publishing_ui_publishing_dialog_install_pane (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
 #line 134 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_g_object_unref0 (_tmp4_);
-#line 831 "PublishingPluginHost.c"
+#line 825 "PublishingPluginHost.c"
 }
 
 
 static void spit_publishing_concrete_publishing_host_real_install_success_pane (SpitPublishingPluginHost* base) {
 	SpitPublishingConcretePublishingHost * self;
-	PublishingUIPublishingDialog* _tmp0_ = NULL;
-	SpitPublishingPublisherMediaType _tmp1_ = 0;
-	SpitPublishingPublishable** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	PublishingUISuccessPane* _tmp3_ = NULL;
-	PublishingUISuccessPane* _tmp4_ = NULL;
-	PublishingUIPublishingDialog* _tmp5_ = NULL;
+	PublishingUIPublishingDialog* _tmp0_;
+	SpitPublishingPublisherMediaType _tmp1_;
+	SpitPublishingPublishable** _tmp2_;
+	gint _tmp2__length1;
+	PublishingUISuccessPane* _tmp3_;
+	PublishingUISuccessPane* _tmp4_;
+	PublishingUIPublishingDialog* _tmp5_;
 #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 138 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -867,15 +861,15 @@ static void spit_publishing_concrete_publishing_host_real_install_success_pane (
 	publishing_ui_publishing_dialog_set_close_button_mode (_tmp5_);
 #line 144 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	spit_publishing_concrete_publishing_host_clean_up (self);
-#line 868 "PublishingPluginHost.c"
+#line 862 "PublishingPluginHost.c"
 }
 
 
 static void spit_publishing_concrete_publishing_host_real_install_account_fetch_wait_pane (SpitPublishingPluginHost* base) {
 	SpitPublishingConcretePublishingHost * self;
-	PublishingUIPublishingDialog* _tmp0_ = NULL;
-	PublishingUIAccountFetchWaitPane* _tmp1_ = NULL;
-	PublishingUIAccountFetchWaitPane* _tmp2_ = NULL;
+	PublishingUIPublishingDialog* _tmp0_;
+	PublishingUIAccountFetchWaitPane* _tmp1_;
+	PublishingUIAccountFetchWaitPane* _tmp2_;
 #line 147 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 148 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -890,15 +884,15 @@ static void spit_publishing_concrete_publishing_host_real_install_account_fetch_
 	_g_object_unref0 (_tmp2_);
 #line 149 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	spit_publishing_concrete_publishing_host_set_button_mode (self, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 891 "PublishingPluginHost.c"
+#line 885 "PublishingPluginHost.c"
 }
 
 
 static void spit_publishing_concrete_publishing_host_real_install_login_wait_pane (SpitPublishingPluginHost* base) {
 	SpitPublishingConcretePublishingHost * self;
-	PublishingUIPublishingDialog* _tmp0_ = NULL;
-	PublishingUILoginWaitPane* _tmp1_ = NULL;
-	PublishingUILoginWaitPane* _tmp2_ = NULL;
+	PublishingUIPublishingDialog* _tmp0_;
+	PublishingUILoginWaitPane* _tmp1_;
+	PublishingUILoginWaitPane* _tmp2_;
 #line 152 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 153 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -911,25 +905,25 @@ static void spit_publishing_concrete_publishing_host_real_install_login_wait_pan
 	publishing_ui_publishing_dialog_install_pane (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
 #line 153 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_g_object_unref0 (_tmp2_);
-#line 912 "PublishingPluginHost.c"
+#line 906 "PublishingPluginHost.c"
 }
 
 
 static void _spit_publishing_concrete_publishing_host_on_login_clicked_publishing_ui_login_welcome_pane_login_requested (PublishingUILoginWelcomePane* _sender, gpointer self) {
 #line 160 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	spit_publishing_concrete_publishing_host_on_login_clicked ((SpitPublishingConcretePublishingHost*) self);
-#line 919 "PublishingPluginHost.c"
+#line 913 "PublishingPluginHost.c"
 }
 
 
 static void spit_publishing_concrete_publishing_host_real_install_welcome_pane (SpitPublishingPluginHost* base, const gchar* welcome_message, SpitPublishingLoginCallback login_clicked_callback, void* login_clicked_callback_target) {
 	SpitPublishingConcretePublishingHost * self;
 	PublishingUILoginWelcomePane* login_pane = NULL;
-	const gchar* _tmp0_ = NULL;
-	PublishingUILoginWelcomePane* _tmp1_ = NULL;
-	SpitPublishingLoginCallback _tmp2_ = NULL;
-	void* _tmp2__target = NULL;
-	PublishingUIPublishingDialog* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	PublishingUILoginWelcomePane* _tmp1_;
+	SpitPublishingLoginCallback _tmp2_;
+	void* _tmp2__target;
+	PublishingUIPublishingDialog* _tmp3_;
 #line 156 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 156 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -958,70 +952,70 @@ static void spit_publishing_concrete_publishing_host_real_install_welcome_pane (
 	publishing_ui_publishing_dialog_install_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (login_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane));
 #line 156 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_g_object_unref0 (login_pane);
-#line 959 "PublishingPluginHost.c"
+#line 953 "PublishingPluginHost.c"
 }
 
 
 static void spit_publishing_concrete_publishing_host_real_set_service_locked (SpitPublishingPluginHost* base, gboolean locked) {
 	SpitPublishingConcretePublishingHost * self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 167 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 168 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_tmp0_ = locked;
 #line 168 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	if (_tmp0_) {
-#line 972 "PublishingPluginHost.c"
-		PublishingUIPublishingDialog* _tmp1_ = NULL;
+#line 966 "PublishingPluginHost.c"
+		PublishingUIPublishingDialog* _tmp1_;
 #line 169 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp1_ = self->priv->dialog;
 #line 169 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		publishing_ui_publishing_dialog_lock_service (_tmp1_);
-#line 978 "PublishingPluginHost.c"
+#line 972 "PublishingPluginHost.c"
 	} else {
-		PublishingUIPublishingDialog* _tmp2_ = NULL;
+		PublishingUIPublishingDialog* _tmp2_;
 #line 171 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp2_ = self->priv->dialog;
 #line 171 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		publishing_ui_publishing_dialog_unlock_service (_tmp2_);
-#line 985 "PublishingPluginHost.c"
+#line 979 "PublishingPluginHost.c"
 	}
 }
 
 
 void spit_publishing_concrete_publishing_host_set_button_mode (SpitPublishingConcretePublishingHost* self, SpitPublishingPluginHostButtonMode mode) {
-	SpitPublishingPluginHostButtonMode _tmp0_ = 0;
+	SpitPublishingPluginHostButtonMode _tmp0_;
 #line 174 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_CONCRETE_PUBLISHING_HOST (self));
 #line 175 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_tmp0_ = mode;
 #line 175 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	if (_tmp0_ == SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE) {
-#line 998 "PublishingPluginHost.c"
-		PublishingUIPublishingDialog* _tmp1_ = NULL;
+#line 992 "PublishingPluginHost.c"
+		PublishingUIPublishingDialog* _tmp1_;
 #line 176 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp1_ = self->priv->dialog;
 #line 176 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		publishing_ui_publishing_dialog_set_close_button_mode (_tmp1_);
-#line 1004 "PublishingPluginHost.c"
+#line 998 "PublishingPluginHost.c"
 	} else {
-		SpitPublishingPluginHostButtonMode _tmp2_ = 0;
+		SpitPublishingPluginHostButtonMode _tmp2_;
 #line 177 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp2_ = mode;
 #line 177 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		if (_tmp2_ == SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL) {
-#line 1011 "PublishingPluginHost.c"
-			PublishingUIPublishingDialog* _tmp3_ = NULL;
+#line 1005 "PublishingPluginHost.c"
+			PublishingUIPublishingDialog* _tmp3_;
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 			_tmp3_ = self->priv->dialog;
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 			publishing_ui_publishing_dialog_set_cancel_button_mode (_tmp3_);
-#line 1017 "PublishingPluginHost.c"
+#line 1011 "PublishingPluginHost.c"
 		} else {
 #line 180 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 			g_error ("PublishingPluginHost.vala:180: unrecognized button mode enumeration va" \
 "lue");
-#line 1021 "PublishingPluginHost.c"
+#line 1015 "PublishingPluginHost.c"
 		}
 	}
 }
@@ -1029,9 +1023,9 @@ void spit_publishing_concrete_publishing_host_set_button_mode (SpitPublishingCon
 
 static void spit_publishing_concrete_publishing_host_real_set_dialog_default_widget (SpitPublishingPluginHost* base, GtkWidget* widget) {
 	SpitPublishingConcretePublishingHost * self;
-	GtkWidget* _tmp0_ = NULL;
-	PublishingUIPublishingDialog* _tmp1_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
+	GtkWidget* _tmp0_;
+	PublishingUIPublishingDialog* _tmp1_;
+	GtkWidget* _tmp2_;
 #line 183 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 183 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1046,14 +1040,14 @@ static void spit_publishing_concrete_publishing_host_real_set_dialog_default_wid
 	_tmp2_ = widget;
 #line 185 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow), _tmp2_);
-#line 1046 "PublishingPluginHost.c"
+#line 1040 "PublishingPluginHost.c"
 }
 
 
 static SpitPublishingPublisherMediaType spit_publishing_concrete_publishing_host_real_get_publishable_media_type (SpitPublishingPluginHost* base) {
 	SpitPublishingConcretePublishingHost * self;
 	SpitPublishingPublisherMediaType result = 0;
-	SpitPublishingPublisherMediaType _tmp0_ = 0;
+	SpitPublishingPublisherMediaType _tmp0_;
 #line 188 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 189 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1062,7 +1056,7 @@ static SpitPublishingPublisherMediaType spit_publishing_concrete_publishing_host
 	result = _tmp0_;
 #line 189 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	return result;
-#line 1062 "PublishingPluginHost.c"
+#line 1056 "PublishingPluginHost.c"
 }
 
 
@@ -1073,29 +1067,29 @@ static SpitPublishingPublishable** _vala_array_dup21 (SpitPublishingPublishable*
 	result = g_new0 (SpitPublishingPublishable*, length + 1);
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	for (i = 0; i < length; i++) {
-#line 1073 "PublishingPluginHost.c"
-		SpitPublishingPublishable* _tmp0_ = NULL;
+#line 1067 "PublishingPluginHost.c"
+		SpitPublishingPublishable* _tmp0_;
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		result[i] = _tmp0_;
-#line 1079 "PublishingPluginHost.c"
+#line 1073 "PublishingPluginHost.c"
 	}
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	return result;
-#line 1083 "PublishingPluginHost.c"
+#line 1077 "PublishingPluginHost.c"
 }
 
 
 static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real_get_publishables (SpitPublishingPluginHost* base, int* result_length1) {
 	SpitPublishingConcretePublishingHost * self;
 	SpitPublishingPublishable** result = NULL;
-	SpitPublishingPublishable** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	SpitPublishingPublishable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	SpitPublishingPublishable** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
+	SpitPublishingPublishable** _tmp0_;
+	gint _tmp0__length1;
+	SpitPublishingPublishable** _tmp1_;
+	gint _tmp1__length1;
+	SpitPublishingPublishable** _tmp2_;
+	gint _tmp2__length1;
 #line 192 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1114,20 +1108,20 @@ static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real
 	if (result_length1) {
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		*result_length1 = _tmp2__length1;
-#line 1114 "PublishingPluginHost.c"
+#line 1108 "PublishingPluginHost.c"
 	}
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	result = _tmp2_;
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	return result;
-#line 1120 "PublishingPluginHost.c"
+#line 1114 "PublishingPluginHost.c"
 }
 
 
 static void _spit_publishing_concrete_publishing_host_report_plugin_upload_progress_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	spit_publishing_concrete_publishing_host_report_plugin_upload_progress ((SpitPublishingConcretePublishingHost*) self, file_number, fraction_complete);
-#line 1127 "PublishingPluginHost.c"
+#line 1121 "PublishingPluginHost.c"
 }
 
 
@@ -1135,14 +1129,14 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 	SpitPublishingConcretePublishingHost * self;
 	SpitPublishingProgressCallback result = NULL;
 	PublishingUIProgressPane* progress_pane = NULL;
-	PublishingUIPublishingDialog* _tmp0_ = NULL;
-	SpitPublishingDialogPane* _tmp1_ = NULL;
+	PublishingUIPublishingDialog* _tmp0_;
+	SpitPublishingDialogPane* _tmp1_;
 	gint i = 0;
-	SpitPublishingPublishable** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	SpitPublishingProgressCallback _tmp25_ = NULL;
-	void* _tmp25__target = NULL;
-	GDestroyNotify _tmp25__target_destroy_notify = NULL;
+	SpitPublishingPublishable** _tmp2_;
+	gint _tmp2__length1;
+	SpitPublishingProgressCallback _tmp25_;
+	void* _tmp25__target;
+	GDestroyNotify _tmp25__target_destroy_notify;
 	GError * _inner_error_ = NULL;
 #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
@@ -1162,7 +1156,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 	_tmp2_ = self->priv->publishables;
 #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_tmp2__length1 = self->priv->publishables_length1;
-#line 1162 "PublishingPluginHost.c"
+#line 1156 "PublishingPluginHost.c"
 	{
 		SpitPublishingPublishable** publishable_collection = NULL;
 		gint publishable_collection_length1 = 0;
@@ -1174,51 +1168,51 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 		publishable_collection_length1 = _tmp2__length1;
 #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 		for (publishable_it = 0; publishable_it < _tmp2__length1; publishable_it = publishable_it + 1) {
-#line 1174 "PublishingPluginHost.c"
-			SpitPublishingPublishable* _tmp3_ = NULL;
+#line 1168 "PublishingPluginHost.c"
+			SpitPublishingPublishable* _tmp3_;
 			SpitPublishingPublishable* publishable = NULL;
 #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 			_tmp3_ = _g_object_ref0 (publishable_collection[publishable_it]);
 #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 			publishable = _tmp3_;
-#line 1181 "PublishingPluginHost.c"
+#line 1175 "PublishingPluginHost.c"
 			{
 				gboolean _tmp4_ = FALSE;
-				gboolean _tmp5_ = FALSE;
+				gboolean _tmp5_;
 				gdouble phase_fraction_complete = 0.0;
-				gint _tmp18_ = 0;
-				SpitPublishingPublishable** _tmp19_ = NULL;
-				gint _tmp19__length1 = 0;
+				gint _tmp18_;
+				SpitPublishingPublishable** _tmp19_;
+				gint _tmp19__length1;
 				gdouble fraction_complete = 0.0;
-				gdouble _tmp20_ = 0.0;
-				gdouble _tmp21_ = 0.0;
-				PublishingUIProgressPane* _tmp22_ = NULL;
-				gdouble _tmp23_ = 0.0;
-				gint _tmp24_ = 0;
+				gdouble _tmp20_;
+				gdouble _tmp21_;
+				PublishingUIProgressPane* _tmp22_;
+				gdouble _tmp23_;
+				gint _tmp24_;
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 				_tmp5_ = self->priv->publishing_halted;
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 				if (_tmp5_) {
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					_tmp4_ = TRUE;
-#line 1201 "PublishingPluginHost.c"
+#line 1195 "PublishingPluginHost.c"
 				} else {
-					SpitPublishingPublisher* _tmp6_ = NULL;
-					gboolean _tmp7_ = FALSE;
+					SpitPublishingPublisher* _tmp6_;
+					gboolean _tmp7_;
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					_tmp6_ = self->priv->active_publisher;
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					_tmp7_ = spit_publishing_publisher_is_running (_tmp6_);
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					_tmp4_ = !_tmp7_;
-#line 1211 "PublishingPluginHost.c"
+#line 1205 "PublishingPluginHost.c"
 				}
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 				if (_tmp4_) {
-#line 1215 "PublishingPluginHost.c"
-					SpitPublishingProgressCallback _tmp8_ = NULL;
-					void* _tmp8__target = NULL;
-					GDestroyNotify _tmp8__target_destroy_notify = NULL;
+#line 1209 "PublishingPluginHost.c"
+					SpitPublishingProgressCallback _tmp8_;
+					void* _tmp8__target;
+					GDestroyNotify _tmp8__target_destroy_notify;
 #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					_tmp8_ = NULL;
 #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1237,17 +1231,17 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					_g_object_unref0 (progress_pane);
 #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					return result;
-#line 1237 "PublishingPluginHost.c"
+#line 1231 "PublishingPluginHost.c"
 				}
 				{
 					PublishingGlueMediaSourcePublishableWrapper* wrapper = NULL;
-					SpitPublishingPublishable* _tmp9_ = NULL;
-					PublishingGlueMediaSourcePublishableWrapper* _tmp10_ = NULL;
-					PublishingGlueMediaSourcePublishableWrapper* _tmp11_ = NULL;
-					gint _tmp12_ = 0;
-					gboolean _tmp13_ = FALSE;
-					GFile* _tmp14_ = NULL;
-					GFile* _tmp15_ = NULL;
+					SpitPublishingPublishable* _tmp9_;
+					PublishingGlueMediaSourcePublishableWrapper* _tmp10_;
+					PublishingGlueMediaSourcePublishableWrapper* _tmp11_;
+					gint _tmp12_;
+					gboolean _tmp13_;
+					GFile* _tmp14_;
+					GFile* _tmp15_;
 #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					_tmp9_ = publishable;
 #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1272,7 +1266,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 						_g_object_unref0 (wrapper);
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1272 "PublishingPluginHost.c"
+#line 1266 "PublishingPluginHost.c"
 							goto __catch38_spit_publishing_publishing_error;
 						}
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1287,20 +1281,20 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 						g_clear_error (&_inner_error_);
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 						return NULL;
-#line 1287 "PublishingPluginHost.c"
+#line 1281 "PublishingPluginHost.c"
 					}
 #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					_g_object_unref0 (wrapper);
-#line 1291 "PublishingPluginHost.c"
+#line 1285 "PublishingPluginHost.c"
 				}
 				goto __finally38;
 				__catch38_spit_publishing_publishing_error:
 				{
 					GError* err = NULL;
-					GError* _tmp16_ = NULL;
-					SpitPublishingProgressCallback _tmp17_ = NULL;
-					void* _tmp17__target = NULL;
-					GDestroyNotify _tmp17__target_destroy_notify = NULL;
+					GError* _tmp16_;
+					SpitPublishingProgressCallback _tmp17_;
+					void* _tmp17__target;
+					GDestroyNotify _tmp17__target_destroy_notify;
 #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					err = _inner_error_;
 #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1329,7 +1323,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					_g_object_unref0 (progress_pane);
 #line 218 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					return result;
-#line 1329 "PublishingPluginHost.c"
+#line 1323 "PublishingPluginHost.c"
 				}
 				__finally38:
 #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1344,7 +1338,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					g_clear_error (&_inner_error_);
 #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 					return NULL;
-#line 1344 "PublishingPluginHost.c"
+#line 1338 "PublishingPluginHost.c"
 				}
 #line 221 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 				_tmp18_ = i;
@@ -1377,7 +1371,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 				i = _tmp24_ + 1;
 #line 208 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 				_g_object_unref0 (publishable);
-#line 1376 "PublishingPluginHost.c"
+#line 1370 "PublishingPluginHost.c"
 			}
 		}
 	}
@@ -1397,7 +1391,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 	_g_object_unref0 (progress_pane);
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	return result;
-#line 1396 "PublishingPluginHost.c"
+#line 1390 "PublishingPluginHost.c"
 }
 
 
@@ -1408,7 +1402,7 @@ static void spit_publishing_concrete_publishing_host_class_init (SpitPublishingC
 	g_type_class_add_private (klass, sizeof (SpitPublishingConcretePublishingHostPrivate));
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	G_OBJECT_CLASS (klass)->finalize = spit_publishing_concrete_publishing_host_finalize;
-#line 1407 "PublishingPluginHost.c"
+#line 1401 "PublishingPluginHost.c"
 }
 
 
@@ -1416,36 +1410,36 @@ static void spit_publishing_concrete_publishing_host_spit_publishing_plugin_host
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	spit_publishing_concrete_publishing_host_spit_publishing_plugin_host_parent_iface = g_type_interface_peek_parent (iface);
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->install_dialog_pane = (void (*)(SpitPublishingPluginHost*, SpitPublishingDialogPane*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_dialog_pane;
+	iface->install_dialog_pane = (void (*) (SpitPublishingPluginHost *, SpitPublishingDialogPane*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_dialog_pane;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->post_error = (void (*)(SpitPublishingPluginHost*, GError*)) spit_publishing_concrete_publishing_host_real_post_error;
+	iface->post_error = (void (*) (SpitPublishingPluginHost *, GError*)) spit_publishing_concrete_publishing_host_real_post_error;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->stop_publishing = (void (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_stop_publishing;
+	iface->stop_publishing = (void (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_stop_publishing;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->get_publisher = (SpitPublishingPublisher* (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_get_publisher;
+	iface->get_publisher = (SpitPublishingPublisher* (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_get_publisher;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->install_static_message_pane = (void (*)(SpitPublishingPluginHost*, const gchar*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_static_message_pane;
+	iface->install_static_message_pane = (void (*) (SpitPublishingPluginHost *, const gchar*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_static_message_pane;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->install_pango_message_pane = (void (*)(SpitPublishingPluginHost*, const gchar*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_pango_message_pane;
+	iface->install_pango_message_pane = (void (*) (SpitPublishingPluginHost *, const gchar*, SpitPublishingPluginHostButtonMode)) spit_publishing_concrete_publishing_host_real_install_pango_message_pane;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->install_success_pane = (void (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_install_success_pane;
+	iface->install_success_pane = (void (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_install_success_pane;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->install_account_fetch_wait_pane = (void (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_install_account_fetch_wait_pane;
+	iface->install_account_fetch_wait_pane = (void (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_install_account_fetch_wait_pane;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->install_login_wait_pane = (void (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_install_login_wait_pane;
+	iface->install_login_wait_pane = (void (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_install_login_wait_pane;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->install_welcome_pane = (void (*)(SpitPublishingPluginHost*, const gchar*, SpitPublishingLoginCallback, void*)) spit_publishing_concrete_publishing_host_real_install_welcome_pane;
+	iface->install_welcome_pane = (void (*) (SpitPublishingPluginHost *, const gchar*, SpitPublishingLoginCallback, void*)) spit_publishing_concrete_publishing_host_real_install_welcome_pane;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->set_service_locked = (void (*)(SpitPublishingPluginHost*, gboolean)) spit_publishing_concrete_publishing_host_real_set_service_locked;
+	iface->set_service_locked = (void (*) (SpitPublishingPluginHost *, gboolean)) spit_publishing_concrete_publishing_host_real_set_service_locked;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->set_dialog_default_widget = (void (*)(SpitPublishingPluginHost*, GtkWidget*)) spit_publishing_concrete_publishing_host_real_set_dialog_default_widget;
+	iface->set_dialog_default_widget = (void (*) (SpitPublishingPluginHost *, GtkWidget*)) spit_publishing_concrete_publishing_host_real_set_dialog_default_widget;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->get_publishable_media_type = (SpitPublishingPublisherMediaType (*)(SpitPublishingPluginHost*)) spit_publishing_concrete_publishing_host_real_get_publishable_media_type;
+	iface->get_publishable_media_type = (SpitPublishingPublisherMediaType (*) (SpitPublishingPluginHost *)) spit_publishing_concrete_publishing_host_real_get_publishable_media_type;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->get_publishables = (SpitPublishingPublishable** (*)(SpitPublishingPluginHost*, int*)) spit_publishing_concrete_publishing_host_real_get_publishables;
+	iface->get_publishables = (SpitPublishingPublishable** (*) (SpitPublishingPluginHost *, int*)) spit_publishing_concrete_publishing_host_real_get_publishables;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	iface->serialize_publishables = (SpitPublishingProgressCallback (*)(SpitPublishingPluginHost*, gint, gboolean, void**, GDestroyNotify*)) spit_publishing_concrete_publishing_host_real_serialize_publishables;
-#line 1444 "PublishingPluginHost.c"
+	iface->serialize_publishables = (SpitPublishingProgressCallback (*) (SpitPublishingPluginHost *, gint, gboolean, void**, GDestroyNotify*)) spit_publishing_concrete_publishing_host_real_serialize_publishables;
+#line 1438 "PublishingPluginHost.c"
 }
 
 
@@ -1464,15 +1458,17 @@ static void spit_publishing_concrete_publishing_host_instance_init (SpitPublishi
 	self->priv->_publishables_size_ = self->priv->publishables_length1;
 #line 19 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self->priv->current_login_callback = NULL;
+#line 19 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
+	self->priv->current_login_callback_target = self;
 #line 20 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self->priv->publishing_halted = FALSE;
 #line 21 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self->priv->media_type = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_NONE;
-#line 1467 "PublishingPluginHost.c"
+#line 1463 "PublishingPluginHost.c"
 }
 
 
-static void spit_publishing_concrete_publishing_host_finalize (GObject* obj) {
+static void spit_publishing_concrete_publishing_host_finalize (GObject * obj) {
 	SpitPublishingConcretePublishingHost * self;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
@@ -1482,7 +1478,7 @@ static void spit_publishing_concrete_publishing_host_finalize (GObject* obj) {
 	self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	G_OBJECT_CLASS (spit_publishing_concrete_publishing_host_parent_class)->finalize (obj);
-#line 1481 "PublishingPluginHost.c"
+#line 1477 "PublishingPluginHost.c"
 }
 
 
diff --git a/src/publishing/PublishingUI.c b/src/publishing/PublishingUI.c
index 0da6971..a0fe079 100644
--- a/src/publishing/PublishingUI.c
+++ b/src/publishing/PublishingUI.c
@@ -1,4 +1,4 @@
-/* PublishingUI.c generated by valac 0.34.7, the Vala compiler
+/* PublishingUI.c generated by valac 0.36.6, the Vala compiler
  * generated from PublishingUI.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -54,6 +54,11 @@ typedef struct _PublishingUIStaticMessagePanePrivate PublishingUIStaticMessagePa
 typedef struct _PublishingUILoginWelcomePane PublishingUILoginWelcomePane;
 typedef struct _PublishingUILoginWelcomePaneClass PublishingUILoginWelcomePaneClass;
 typedef struct _PublishingUILoginWelcomePanePrivate PublishingUILoginWelcomePanePrivate;
+enum  {
+	PUBLISHING_UI_LOGIN_WELCOME_PANE_LOGIN_REQUESTED_SIGNAL,
+	PUBLISHING_UI_LOGIN_WELCOME_PANE_LAST_SIGNAL
+};
+static guint publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOME_PANE_LAST_SIGNAL] = {0};
 
 #define PUBLISHING_UI_TYPE_PROGRESS_PANE (publishing_ui_progress_pane_get_type ())
 #define PUBLISHING_UI_PROGRESS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_UI_TYPE_PROGRESS_PANE, PublishingUIProgressPane))
@@ -378,7 +383,7 @@ struct _PublishingUIPublishingDialogPrivate {
 
 
 static gpointer publishing_ui_concrete_dialog_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+static SpitPublishingDialogPaneIface * publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_ui_static_message_pane_parent_class = NULL;
 static gpointer publishing_ui_login_welcome_pane_parent_class = NULL;
 static gpointer publishing_ui_progress_pane_parent_class = NULL;
@@ -404,7 +409,7 @@ static GtkWidget* publishing_ui_concrete_dialog_pane_real_get_widget (SpitPublis
 static SpitPublishingDialogPaneGeometryOptions publishing_ui_concrete_dialog_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
 static void publishing_ui_concrete_dialog_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
 static void publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
-static void publishing_ui_concrete_dialog_pane_finalize (GObject* obj);
+static void publishing_ui_concrete_dialog_pane_finalize (GObject * obj);
 GType publishing_ui_static_message_pane_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_UI_STATIC_MESSAGE_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_UI_TYPE_STATIC_MESSAGE_PANE, PublishingUIStaticMessagePanePrivate))
 enum  {
@@ -412,7 +417,7 @@ enum  {
 };
 PublishingUIStaticMessagePane* publishing_ui_static_message_pane_new (const gchar* message_string, gboolean enable_markup);
 PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GType object_type, const gchar* message_string, gboolean enable_markup);
-static void publishing_ui_static_message_pane_finalize (GObject* obj);
+static void publishing_ui_static_message_pane_finalize (GObject * obj);
 GType publishing_ui_login_welcome_pane_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_UI_LOGIN_WELCOME_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, PublishingUILoginWelcomePanePrivate))
 enum  {
@@ -422,7 +427,7 @@ PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_new (const gchar*
 PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType object_type, const gchar* service_welcome_message);
 static void publishing_ui_login_welcome_pane_on_login_clicked (PublishingUILoginWelcomePane* self);
 static void _publishing_ui_login_welcome_pane_on_login_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void publishing_ui_login_welcome_pane_finalize (GObject* obj);
+static void publishing_ui_login_welcome_pane_finalize (GObject * obj);
 GType publishing_ui_progress_pane_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_UI_PROGRESS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_UI_TYPE_PROGRESS_PANE, PublishingUIProgressPanePrivate))
 enum  {
@@ -433,7 +438,7 @@ PublishingUIProgressPane* publishing_ui_progress_pane_construct (GType object_ty
 void publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self, const gchar* text);
 void publishing_ui_progress_pane_set_progress (PublishingUIProgressPane* self, gdouble progress);
 void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, const gchar* status_text, gdouble progress);
-static void publishing_ui_progress_pane_finalize (GObject* obj);
+static void publishing_ui_progress_pane_finalize (GObject * obj);
 GType publishing_ui_success_pane_get_type (void) G_GNUC_CONST;
 enum  {
 	PUBLISHING_UI_SUCCESS_PANE_DUMMY_PROPERTY
@@ -483,7 +488,7 @@ static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_dele
 PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_new (MediaSource* to_wrap);
 PublishingGlueMediaSourcePublishableWrapper* publishing_glue_media_source_publishable_wrapper_construct (GType object_type, MediaSource* to_wrap);
 GType publishing_glue_media_source_publishable_wrapper_get_type (void) G_GNUC_CONST;
-static void _vala_array_add55 (SpitPublishingPublishable*** array, int* length, int* size, SpitPublishingPublishable* value);
+static void _vala_array_add55 (SpitPublishingPublishable** * array, int* length, int* size, SpitPublishingPublishable* value);
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
@@ -500,13 +505,13 @@ static void publishing_ui_publishing_dialog_set_standard_window_mode (Publishing
 static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services (int* result_length1);
 GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled);
 gchar* plugins_get_pluggable_module_id (SpitPluggable* needle);
-static void _vala_array_add56 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value);
+static void _vala_array_add56 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
 static gint __lambda15_ (void* a, void* b);
 gint utf8_cs_compare (void* a, void* b);
 static gint ___lambda15____compar_fn_t (void* key1, void* key2);
-static void _vala_array_add57 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value);
-static void _vala_array_add58 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value);
-static void _vala_array_add59 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value);
+static void _vala_array_add57 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
+static void _vala_array_add58 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
+static void _vala_array_add59 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
 void publishing_ui_publishing_dialog_go (GeeCollection* to_publish);
 GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
@@ -530,14 +535,14 @@ void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublish
 void publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self);
 void publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self);
 void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* self, SpitPublishingDialogPane* pane);
-static void publishing_ui_publishing_dialog_finalize (GObject* obj);
+static void publishing_ui_publishing_dialog_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);
 
 
 PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_construct (GType object_type) {
 	PublishingUIConcreteDialogPane * self = NULL;
-	GtkBuilder* _tmp0_ = NULL;
+	GtkBuilder* _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = (PublishingUIConcreteDialogPane*) g_object_new (object_type, NULL);
 #line 14 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -548,29 +553,29 @@ PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_construct (GT
 	self->builder = _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 552 "PublishingUI.c"
+#line 557 "PublishingUI.c"
 }
 
 
 PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_new (void) {
 #line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_concrete_dialog_pane_construct (PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE);
-#line 559 "PublishingUI.c"
+#line 564 "PublishingUI.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 18 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 566 "PublishingUI.c"
+#line 571 "PublishingUI.c"
 }
 
 
 static GtkWidget* publishing_ui_concrete_dialog_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	PublishingUIConcreteDialogPane * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBox* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 17 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane);
 #line 18 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -581,7 +586,7 @@ static GtkWidget* publishing_ui_concrete_dialog_pane_real_get_widget (SpitPublis
 	result = _tmp1_;
 #line 18 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 585 "PublishingUI.c"
+#line 590 "PublishingUI.c"
 }
 
 
@@ -594,7 +599,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_ui_concrete_dialog_pan
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 22 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 598 "PublishingUI.c"
+#line 603 "PublishingUI.c"
 }
 
 
@@ -602,7 +607,7 @@ static void publishing_ui_concrete_dialog_pane_real_on_pane_installed (SpitPubli
 	PublishingUIConcreteDialogPane * self;
 #line 25 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane);
-#line 606 "PublishingUI.c"
+#line 611 "PublishingUI.c"
 }
 
 
@@ -610,7 +615,7 @@ static void publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled (SpitPub
 	PublishingUIConcreteDialogPane * self;
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane);
-#line 614 "PublishingUI.c"
+#line 619 "PublishingUI.c"
 }
 
 
@@ -619,7 +624,7 @@ static void publishing_ui_concrete_dialog_pane_class_init (PublishingUIConcreteD
 	publishing_ui_concrete_dialog_pane_parent_class = g_type_class_peek_parent (klass);
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_ui_concrete_dialog_pane_finalize;
-#line 623 "PublishingUI.c"
+#line 628 "PublishingUI.c"
 }
 
 
@@ -627,14 +632,14 @@ static void publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_inter
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_ui_concrete_dialog_pane_real_get_widget;
+	iface->get_widget = (GtkWidget* (*) (SpitPublishingDialogPane *)) publishing_ui_concrete_dialog_pane_real_get_widget;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_ui_concrete_dialog_pane_real_get_preferred_geometry;
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*) (SpitPublishingDialogPane *)) publishing_ui_concrete_dialog_pane_real_get_preferred_geometry;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_ui_concrete_dialog_pane_real_on_pane_installed;
+	iface->on_pane_installed = (void (*) (SpitPublishingDialogPane *)) publishing_ui_concrete_dialog_pane_real_on_pane_installed;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled;
-#line 638 "PublishingUI.c"
+	iface->on_pane_uninstalled = (void (*) (SpitPublishingDialogPane *)) publishing_ui_concrete_dialog_pane_real_on_pane_uninstalled;
+#line 643 "PublishingUI.c"
 }
 
 
@@ -643,11 +648,11 @@ static void publishing_ui_concrete_dialog_pane_instance_init (PublishingUIConcre
 	self->pane_widget = NULL;
 #line 11 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->builder = NULL;
-#line 647 "PublishingUI.c"
+#line 652 "PublishingUI.c"
 }
 
 
-static void publishing_ui_concrete_dialog_pane_finalize (GObject* obj) {
+static void publishing_ui_concrete_dialog_pane_finalize (GObject * obj) {
 	PublishingUIConcreteDialogPane * self;
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_CONCRETE_DIALOG_PANE, PublishingUIConcreteDialogPane);
@@ -657,7 +662,7 @@ static void publishing_ui_concrete_dialog_pane_finalize (GObject* obj) {
 	_g_object_unref0 (self->builder);
 #line 9 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (publishing_ui_concrete_dialog_pane_parent_class)->finalize (obj);
-#line 661 "PublishingUI.c"
+#line 666 "PublishingUI.c"
 }
 
 
@@ -677,13 +682,13 @@ GType publishing_ui_concrete_dialog_pane_get_type (void) {
 
 PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GType object_type, const gchar* message_string, gboolean enable_markup) {
 	PublishingUIStaticMessagePane * self = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	GtkLabel* _tmp2_ = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GObject* _tmp4_ = NULL;
-	GtkBox* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
+	GtkBuilder* _tmp0_;
+	GObject* _tmp1_;
+	GtkLabel* _tmp2_;
+	GtkBuilder* _tmp3_;
+	GObject* _tmp4_;
+	GtkBox* _tmp5_;
+	gboolean _tmp6_;
 #line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (message_string != NULL, NULL);
 #line 36 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -712,11 +717,11 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp
 	_tmp6_ = enable_markup;
 #line 40 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp6_) {
-#line 716 "PublishingUI.c"
-		GtkLabel* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		GtkLabel* _tmp9_ = NULL;
-		GtkLabel* _tmp10_ = NULL;
+#line 721 "PublishingUI.c"
+		GtkLabel* _tmp7_;
+		const gchar* _tmp8_;
+		GtkLabel* _tmp9_;
+		GtkLabel* _tmp10_;
 #line 41 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp7_ = self->priv->msg_label;
 #line 41 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -731,28 +736,28 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp
 		_tmp10_ = self->priv->msg_label;
 #line 43 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_label_set_use_markup (_tmp10_, TRUE);
-#line 735 "PublishingUI.c"
+#line 740 "PublishingUI.c"
 	} else {
-		GtkLabel* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
+		GtkLabel* _tmp11_;
+		const gchar* _tmp12_;
 #line 45 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp11_ = self->priv->msg_label;
 #line 45 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp12_ = message_string;
 #line 45 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_label_set_label (_tmp11_, _tmp12_);
-#line 745 "PublishingUI.c"
+#line 750 "PublishingUI.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 749 "PublishingUI.c"
+#line 754 "PublishingUI.c"
 }
 
 
 PublishingUIStaticMessagePane* publishing_ui_static_message_pane_new (const gchar* message_string, gboolean enable_markup) {
 #line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_static_message_pane_construct (PUBLISHING_UI_TYPE_STATIC_MESSAGE_PANE, message_string, enable_markup);
-#line 756 "PublishingUI.c"
+#line 761 "PublishingUI.c"
 }
 
 
@@ -763,7 +768,7 @@ static void publishing_ui_static_message_pane_class_init (PublishingUIStaticMess
 	g_type_class_add_private (klass, sizeof (PublishingUIStaticMessagePanePrivate));
 #line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_ui_static_message_pane_finalize;
-#line 767 "PublishingUI.c"
+#line 772 "PublishingUI.c"
 }
 
 
@@ -772,11 +777,11 @@ static void publishing_ui_static_message_pane_instance_init (PublishingUIStaticM
 	self->priv = PUBLISHING_UI_STATIC_MESSAGE_PANE_GET_PRIVATE (self);
 #line 33 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->msg_label = NULL;
-#line 776 "PublishingUI.c"
+#line 781 "PublishingUI.c"
 }
 
 
-static void publishing_ui_static_message_pane_finalize (GObject* obj) {
+static void publishing_ui_static_message_pane_finalize (GObject * obj) {
 	PublishingUIStaticMessagePane * self;
 #line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_STATIC_MESSAGE_PANE, PublishingUIStaticMessagePane);
@@ -784,7 +789,7 @@ static void publishing_ui_static_message_pane_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->msg_label);
 #line 32 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (publishing_ui_static_message_pane_parent_class)->finalize (obj);
-#line 788 "PublishingUI.c"
+#line 793 "PublishingUI.c"
 }
 
 
@@ -803,25 +808,25 @@ GType publishing_ui_static_message_pane_get_type (void) {
 static void _publishing_ui_login_welcome_pane_on_login_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 62 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_login_welcome_pane_on_login_clicked ((PublishingUILoginWelcomePane*) self);
-#line 807 "PublishingUI.c"
+#line 812 "PublishingUI.c"
 }
 
 
 PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType object_type, const gchar* service_welcome_message) {
 	PublishingUILoginWelcomePane * self = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	GtkBox* _tmp2_ = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GObject* _tmp4_ = NULL;
-	GtkButton* _tmp5_ = NULL;
-	GtkBuilder* _tmp6_ = NULL;
-	GObject* _tmp7_ = NULL;
-	GtkLabel* _tmp8_ = NULL;
-	GtkButton* _tmp9_ = NULL;
-	GtkLabel* _tmp10_ = NULL;
-	GtkLabel* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
+	GtkBuilder* _tmp0_;
+	GObject* _tmp1_;
+	GtkBox* _tmp2_;
+	GtkBuilder* _tmp3_;
+	GObject* _tmp4_;
+	GtkButton* _tmp5_;
+	GtkBuilder* _tmp6_;
+	GObject* _tmp7_;
+	GtkLabel* _tmp8_;
+	GtkButton* _tmp9_;
+	GtkLabel* _tmp10_;
+	GtkLabel* _tmp11_;
+	const gchar* _tmp12_;
 #line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (service_welcome_message != NULL, NULL);
 #line 57 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -872,14 +877,14 @@ PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_construct (GType
 	gtk_label_set_markup (_tmp11_, _tmp12_);
 #line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 876 "PublishingUI.c"
+#line 881 "PublishingUI.c"
 }
 
 
 PublishingUILoginWelcomePane* publishing_ui_login_welcome_pane_new (const gchar* service_welcome_message) {
 #line 56 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_login_welcome_pane_construct (PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, service_welcome_message);
-#line 883 "PublishingUI.c"
+#line 888 "PublishingUI.c"
 }
 
 
@@ -887,8 +892,8 @@ static void publishing_ui_login_welcome_pane_on_login_clicked (PublishingUILogin
 #line 67 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_LOGIN_WELCOME_PANE (self));
 #line 68 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_signal_emit_by_name (self, "login-requested");
-#line 892 "PublishingUI.c"
+	g_signal_emit (self, publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOME_PANE_LOGIN_REQUESTED_SIGNAL], 0);
+#line 897 "PublishingUI.c"
 }
 
 
@@ -900,8 +905,8 @@ static void publishing_ui_login_welcome_pane_class_init (PublishingUILoginWelcom
 #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_ui_login_welcome_pane_finalize;
 #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_signal_new ("login_requested", PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 905 "PublishingUI.c"
+	publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOME_PANE_LOGIN_REQUESTED_SIGNAL] = g_signal_new ("login-requested", PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 910 "PublishingUI.c"
 }
 
 
@@ -912,11 +917,11 @@ static void publishing_ui_login_welcome_pane_instance_init (PublishingUILoginWel
 	self->priv->login_button = NULL;
 #line 52 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->not_logged_in_label = NULL;
-#line 916 "PublishingUI.c"
+#line 921 "PublishingUI.c"
 }
 
 
-static void publishing_ui_login_welcome_pane_finalize (GObject* obj) {
+static void publishing_ui_login_welcome_pane_finalize (GObject * obj) {
 	PublishingUILoginWelcomePane * self;
 #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_LOGIN_WELCOME_PANE, PublishingUILoginWelcomePane);
@@ -926,7 +931,7 @@ static void publishing_ui_login_welcome_pane_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->not_logged_in_label);
 #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (publishing_ui_login_welcome_pane_parent_class)->finalize (obj);
-#line 930 "PublishingUI.c"
+#line 935 "PublishingUI.c"
 }
 
 
@@ -944,12 +949,12 @@ GType publishing_ui_login_welcome_pane_get_type (void) {
 
 PublishingUIProgressPane* publishing_ui_progress_pane_construct (GType object_type) {
 	PublishingUIProgressPane * self = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	GtkBox* _tmp2_ = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GObject* _tmp4_ = NULL;
-	GtkProgressBar* _tmp5_ = NULL;
+	GtkBuilder* _tmp0_;
+	GObject* _tmp1_;
+	GtkBox* _tmp2_;
+	GtkBuilder* _tmp3_;
+	GObject* _tmp4_;
+	GtkProgressBar* _tmp5_;
 #line 76 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = (PublishingUIProgressPane*) publishing_ui_concrete_dialog_pane_construct (object_type);
 #line 77 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -974,20 +979,20 @@ PublishingUIProgressPane* publishing_ui_progress_pane_construct (GType object_ty
 	self->priv->progress_bar = _tmp5_;
 #line 75 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 978 "PublishingUI.c"
+#line 983 "PublishingUI.c"
 }
 
 
 PublishingUIProgressPane* publishing_ui_progress_pane_new (void) {
 #line 75 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_progress_pane_construct (PUBLISHING_UI_TYPE_PROGRESS_PANE);
-#line 985 "PublishingUI.c"
+#line 990 "PublishingUI.c"
 }
 
 
 void publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self, const gchar* text) {
-	GtkProgressBar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	GtkProgressBar* _tmp0_;
+	const gchar* _tmp1_;
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PROGRESS_PANE (self));
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -998,13 +1003,13 @@ void publishing_ui_progress_pane_set_text (PublishingUIProgressPane* self, const
 	_tmp1_ = text;
 #line 82 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 1002 "PublishingUI.c"
+#line 1007 "PublishingUI.c"
 }
 
 
 void publishing_ui_progress_pane_set_progress (PublishingUIProgressPane* self, gdouble progress) {
-	GtkProgressBar* _tmp0_ = NULL;
-	gdouble _tmp1_ = 0.0;
+	GtkProgressBar* _tmp0_;
+	gdouble _tmp1_;
 #line 85 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PROGRESS_PANE (self));
 #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1013,15 +1018,15 @@ void publishing_ui_progress_pane_set_progress (PublishingUIProgressPane* self, g
 	_tmp1_ = progress;
 #line 86 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
-#line 1017 "PublishingUI.c"
+#line 1022 "PublishingUI.c"
 }
 
 
 void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, const gchar* status_text, gdouble progress) {
-	const gchar* _tmp0_ = NULL;
-	GtkProgressBar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gdouble _tmp5_ = 0.0;
+	const gchar* _tmp0_;
+	GtkProgressBar* _tmp1_;
+	const gchar* _tmp2_;
+	gdouble _tmp5_;
 #line 89 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PROGRESS_PANE (self));
 #line 89 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1034,22 +1039,22 @@ void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, con
 	_tmp2_ = gtk_progress_bar_get_text (_tmp1_);
 #line 90 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (g_strcmp0 (_tmp0_, _tmp2_) != 0) {
-#line 1038 "PublishingUI.c"
-		GtkProgressBar* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
+#line 1043 "PublishingUI.c"
+		GtkProgressBar* _tmp3_;
+		const gchar* _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp3_ = self->priv->progress_bar;
 #line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = status_text;
 #line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_progress_bar_set_text (_tmp3_, _tmp4_);
-#line 1047 "PublishingUI.c"
+#line 1052 "PublishingUI.c"
 	}
 #line 93 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp5_ = progress;
 #line 93 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_progress_pane_set_progress (self, _tmp5_);
-#line 1053 "PublishingUI.c"
+#line 1058 "PublishingUI.c"
 }
 
 
@@ -1060,7 +1065,7 @@ static void publishing_ui_progress_pane_class_init (PublishingUIProgressPaneClas
 	g_type_class_add_private (klass, sizeof (PublishingUIProgressPanePrivate));
 #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_ui_progress_pane_finalize;
-#line 1064 "PublishingUI.c"
+#line 1069 "PublishingUI.c"
 }
 
 
@@ -1069,11 +1074,11 @@ static void publishing_ui_progress_pane_instance_init (PublishingUIProgressPane
 	self->priv = PUBLISHING_UI_PROGRESS_PANE_GET_PRIVATE (self);
 #line 73 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->progress_bar = NULL;
-#line 1073 "PublishingUI.c"
+#line 1078 "PublishingUI.c"
 }
 
 
-static void publishing_ui_progress_pane_finalize (GObject* obj) {
+static void publishing_ui_progress_pane_finalize (GObject * obj) {
 	PublishingUIProgressPane * self;
 #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_PROGRESS_PANE, PublishingUIProgressPane);
@@ -1081,7 +1086,7 @@ static void publishing_ui_progress_pane_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->progress_bar);
 #line 72 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (publishing_ui_progress_pane_parent_class)->finalize (obj);
-#line 1085 "PublishingUI.c"
+#line 1090 "PublishingUI.c"
 }
 
 
@@ -1100,98 +1105,89 @@ GType publishing_ui_progress_pane_get_type (void) {
 PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type, SpitPublishingPublisherMediaType published_media, gint num_uploaded) {
 	PublishingUISuccessPane * self = NULL;
 	gchar* message_string = NULL;
-	SpitPublishingPublisherMediaType _tmp0_ = 0;
-	const gchar* _tmp11_ = NULL;
+	SpitPublishingPublisherMediaType _tmp0_;
+	const gchar* _tmp8_;
 #line 99 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	message_string = NULL;
 #line 103 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = published_media;
 #line 103 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1112 "PublishingUI.c"
-		gint _tmp1_ = 0;
-		const gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+#line 1117 "PublishingUI.c"
+		gint _tmp1_;
+		gchar* _tmp2_;
 #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp1_ = num_uploaded;
 #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp2_ = ngettext ("The selected video was successfully published.", "The selected videos were successfully published.", (gulong) _tmp1_);
-#line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp3_ = g_strdup (_tmp2_);
+		_tmp2_ = g_strdup (ngettext ("The selected video was successfully published.", "The selected videos were successfully published.", (gulong) _tmp1_));
 #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_free0 (message_string);
 #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		message_string = _tmp3_;
-#line 1126 "PublishingUI.c"
+		message_string = _tmp2_;
+#line 1128 "PublishingUI.c"
 	} else {
-		SpitPublishingPublisherMediaType _tmp4_ = 0;
+		SpitPublishingPublisherMediaType _tmp3_;
 #line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp4_ = published_media;
+		_tmp3_ = published_media;
 #line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		if (_tmp4_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 1133 "PublishingUI.c"
-			gint _tmp5_ = 0;
-			const gchar* _tmp6_ = NULL;
-			gchar* _tmp7_ = NULL;
-#line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp5_ = num_uploaded;
+		if (_tmp3_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
+#line 1135 "PublishingUI.c"
+			gint _tmp4_;
+			gchar* _tmp5_;
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp6_ = ngettext ("The selected photo was successfully published.", "The selected photos were successfully published.", (gulong) _tmp5_);
+			_tmp4_ = num_uploaded;
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp7_ = g_strdup (_tmp6_);
+			_tmp5_ = g_strdup (ngettext ("The selected photo was successfully published.", "The selected photos were successfully published.", (gulong) _tmp4_));
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (message_string);
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			message_string = _tmp7_;
-#line 1147 "PublishingUI.c"
+			message_string = _tmp5_;
+#line 1146 "PublishingUI.c"
 		} else {
-			SpitPublishingPublisherMediaType _tmp8_ = 0;
+			SpitPublishingPublisherMediaType _tmp6_;
 #line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp8_ = published_media;
+			_tmp6_ = published_media;
 #line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			if (_tmp8_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
-#line 1154 "PublishingUI.c"
-				const gchar* _tmp9_ = NULL;
-				gchar* _tmp10_ = NULL;
+			if (_tmp6_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
+#line 1153 "PublishingUI.c"
+				gchar* _tmp7_;
 #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp9_ = _ ("The selected photos/videos were successfully published.");
-#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp10_ = g_strdup (_tmp9_);
+				_tmp7_ = g_strdup (_ ("The selected photos/videos were successfully published."));
 #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_free0 (message_string);
 #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				message_string = _tmp10_;
-#line 1165 "PublishingUI.c"
+				message_string = _tmp7_;
+#line 1161 "PublishingUI.c"
 			} else {
 #line 118 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				g_assert_not_reached ();
-#line 1169 "PublishingUI.c"
+#line 1165 "PublishingUI.c"
 			}
 		}
 	}
 #line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp11_ = message_string;
+	_tmp8_ = message_string;
 #line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self = (PublishingUISuccessPane*) publishing_ui_static_message_pane_construct (object_type, _tmp11_, FALSE);
+	self = (PublishingUISuccessPane*) publishing_ui_static_message_pane_construct (object_type, _tmp8_, FALSE);
 #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_free0 (message_string);
 #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 1181 "PublishingUI.c"
+#line 1177 "PublishingUI.c"
 }
 
 
 PublishingUISuccessPane* publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media, gint num_uploaded) {
 #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_success_pane_construct (PUBLISHING_UI_TYPE_SUCCESS_PANE, published_media, num_uploaded);
-#line 1188 "PublishingUI.c"
+#line 1184 "PublishingUI.c"
 }
 
 
 static void publishing_ui_success_pane_class_init (PublishingUISuccessPaneClass * klass) {
 #line 97 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_success_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1195 "PublishingUI.c"
+#line 1191 "PublishingUI.c"
 }
 
 
@@ -1213,28 +1209,25 @@ GType publishing_ui_success_pane_get_type (void) {
 
 PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_construct (GType object_type) {
 	PublishingUIAccountFetchWaitPane * self = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 127 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp0_ = _ ("Fetching account information…");
-#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self = (PublishingUIAccountFetchWaitPane*) publishing_ui_static_message_pane_construct (object_type, _tmp0_, FALSE);
+	self = (PublishingUIAccountFetchWaitPane*) publishing_ui_static_message_pane_construct (object_type, _ ("Fetching account information…"), FALSE);
 #line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 1224 "PublishingUI.c"
+#line 1217 "PublishingUI.c"
 }
 
 
 PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_new (void) {
 #line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_account_fetch_wait_pane_construct (PUBLISHING_UI_TYPE_ACCOUNT_FETCH_WAIT_PANE);
-#line 1231 "PublishingUI.c"
+#line 1224 "PublishingUI.c"
 }
 
 
 static void publishing_ui_account_fetch_wait_pane_class_init (PublishingUIAccountFetchWaitPaneClass * klass) {
 #line 125 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_account_fetch_wait_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1238 "PublishingUI.c"
+#line 1231 "PublishingUI.c"
 }
 
 
@@ -1256,28 +1249,25 @@ GType publishing_ui_account_fetch_wait_pane_get_type (void) {
 
 PublishingUILoginWaitPane* publishing_ui_login_wait_pane_construct (GType object_type) {
 	PublishingUILoginWaitPane * self = NULL;
-	const gchar* _tmp0_ = NULL;
-#line 133 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp0_ = _ ("Logging in…");
 #line 133 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self = (PublishingUILoginWaitPane*) publishing_ui_static_message_pane_construct (object_type, _tmp0_, FALSE);
+	self = (PublishingUILoginWaitPane*) publishing_ui_static_message_pane_construct (object_type, _ ("Logging in…"), FALSE);
 #line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 1267 "PublishingUI.c"
+#line 1257 "PublishingUI.c"
 }
 
 
 PublishingUILoginWaitPane* publishing_ui_login_wait_pane_new (void) {
 #line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_login_wait_pane_construct (PUBLISHING_UI_TYPE_LOGIN_WAIT_PANE);
-#line 1274 "PublishingUI.c"
+#line 1264 "PublishingUI.c"
 }
 
 
 static void publishing_ui_login_wait_pane_class_init (PublishingUILoginWaitPaneClass * klass) {
 #line 131 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_login_wait_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1281 "PublishingUI.c"
+#line 1271 "PublishingUI.c"
 }
 
 
@@ -1302,99 +1292,99 @@ static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_dele
 	result = publishing_ui_publishing_dialog_on_window_close ((PublishingUIPublishingDialog*) self, event);
 #line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 1306 "PublishingUI.c"
+#line 1296 "PublishingUI.c"
 }
 
 
-static void _vala_array_add55 (SpitPublishingPublishable*** array, int* length, int* size, SpitPublishingPublishable* value) {
+static void _vala_array_add55 (SpitPublishingPublishable** * array, int* length, int* size, SpitPublishingPublishable* value) {
 #line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
 #line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingPublishable*, *array, (*size) + 1);
-#line 1317 "PublishingUI.c"
+#line 1307 "PublishingUI.c"
 	}
 #line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
 #line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 1323 "PublishingUI.c"
+#line 1313 "PublishingUI.c"
 }
 
 
 static void _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_on_service_changed ((PublishingUIPublishingDialog*) self);
-#line 1330 "PublishingUI.c"
+#line 1320 "PublishingUI.c"
 }
 
 
 static void _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_on_close_cancel_clicked ((PublishingUIPublishingDialog*) self);
-#line 1337 "PublishingUI.c"
+#line 1327 "PublishingUI.c"
 }
 
 
 PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType object_type, GeeCollection* to_publish) {
 	PublishingUIPublishingDialog * self = NULL;
-	GeeCollection* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	GeeCollection* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gboolean use_header = FALSE;
-	GtkSettings* _tmp3_ = NULL;
+	GtkSettings* _tmp3_;
 	gint _tmp4_ = 0;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	AppWindow* _tmp8_ = NULL;
-	AppWindow* _tmp9_ = NULL;
-	SpitPublishingPublishable** _tmp10_ = NULL;
+	gboolean _tmp5_;
+	gboolean _tmp6_;
+	AppWindow* _tmp8_;
+	AppWindow* _tmp9_;
+	SpitPublishingPublishable** _tmp10_;
 	gboolean has_photos = FALSE;
 	gboolean has_videos = FALSE;
 	gchar* title = NULL;
 	gchar* label = NULL;
 	gboolean _tmp26_ = FALSE;
-	gboolean _tmp27_ = FALSE;
-	const gchar* _tmp44_ = NULL;
-	GtkListStore* _tmp45_ = NULL;
-	GtkListStore* _tmp46_ = NULL;
-	GtkComboBox* _tmp47_ = NULL;
+	gboolean _tmp27_;
+	const gchar* _tmp38_;
+	GtkListStore* _tmp39_;
+	GtkListStore* _tmp40_;
+	GtkComboBox* _tmp41_;
 	GtkCellRendererPixbuf* renderer_pix = NULL;
-	GtkCellRendererPixbuf* _tmp48_ = NULL;
-	GtkComboBox* _tmp49_ = NULL;
-	GtkCellRendererPixbuf* _tmp50_ = NULL;
-	GtkComboBox* _tmp51_ = NULL;
-	GtkCellRendererPixbuf* _tmp52_ = NULL;
+	GtkCellRendererPixbuf* _tmp42_;
+	GtkComboBox* _tmp43_;
+	GtkCellRendererPixbuf* _tmp44_;
+	GtkComboBox* _tmp45_;
+	GtkCellRendererPixbuf* _tmp46_;
 	GtkCellRendererText* renderer_text = NULL;
-	GtkCellRendererText* _tmp53_ = NULL;
-	GtkComboBox* _tmp54_ = NULL;
-	GtkCellRendererText* _tmp55_ = NULL;
-	GtkComboBox* _tmp56_ = NULL;
-	GtkCellRendererText* _tmp57_ = NULL;
-	GtkComboBox* _tmp58_ = NULL;
+	GtkCellRendererText* _tmp47_;
+	GtkComboBox* _tmp48_;
+	GtkCellRendererText* _tmp49_;
+	GtkComboBox* _tmp50_;
+	GtkCellRendererText* _tmp51_;
+	GtkComboBox* _tmp52_;
 	gchar* last_used_service = NULL;
-	ConfigFacade* _tmp59_ = NULL;
-	ConfigFacade* _tmp60_ = NULL;
-	gchar* _tmp61_ = NULL;
-	gchar* _tmp62_ = NULL;
+	ConfigFacade* _tmp53_;
+	ConfigFacade* _tmp54_;
+	gchar* _tmp55_;
+	gchar* _tmp56_;
 	SpitPublishingService** loaded_services = NULL;
-	gboolean _tmp63_ = FALSE;
-	gboolean _tmp64_ = FALSE;
-	gint _tmp65_ = 0;
-	SpitPublishingService** _tmp66_ = NULL;
-	gint loaded_services_length1 = 0;
-	gint _loaded_services_size_ = 0;
+	gboolean _tmp57_;
+	gboolean _tmp58_;
+	gint _tmp59_;
+	SpitPublishingService** _tmp60_;
+	gint loaded_services_length1;
+	gint _loaded_services_size_;
 	GtkTreeIter iter = {0};
-	SpitPublishingService** _tmp67_ = NULL;
-	gint _tmp67__length1 = 0;
-	GtkComboBox* _tmp105_ = NULL;
-	gboolean _tmp106_ = FALSE;
-	GtkBox* _tmp136_ = NULL;
-	GtkBox* _tmp137_ = NULL;
-	GtkBox* _tmp138_ = NULL;
-	gboolean _tmp139_ = FALSE;
-	GtkButton* _tmp149_ = NULL;
+	SpitPublishingService** _tmp61_;
+	gint _tmp61__length1;
+	GtkComboBox* _tmp99_;
+	gboolean _tmp100_;
+	GtkBox* _tmp130_;
+	GtkBox* _tmp131_;
+	GtkBox* _tmp132_;
+	gboolean _tmp133_;
+	GtkButton* _tmp142_;
 #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (to_publish), NULL);
 #line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1417,11 +1407,11 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 	if (_tmp5_) {
 #line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = 1;
-#line 1421 "PublishingUI.c"
+#line 1411 "PublishingUI.c"
 	} else {
 #line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = 0;
-#line 1425 "PublishingUI.c"
+#line 1415 "PublishingUI.c"
 	}
 #line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = (PublishingUIPublishingDialog*) g_object_new (object_type, "use-header-bar", _tmp4_, NULL);
@@ -1429,13 +1419,13 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 	_tmp6_ = use_header;
 #line 167 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp6_) {
-#line 1433 "PublishingUI.c"
-		GtkWidget* _tmp7_ = NULL;
+#line 1423 "PublishingUI.c"
+		GtkWidget* _tmp7_;
 #line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp7_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE);
-#line 1439 "PublishingUI.c"
+#line 1429 "PublishingUI.c"
 	}
 #line 170 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
@@ -1465,11 +1455,11 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 	has_photos = FALSE;
 #line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	has_videos = FALSE;
-#line 1469 "PublishingUI.c"
+#line 1459 "PublishingUI.c"
 	{
 		GeeIterator* _media_it = NULL;
-		GeeCollection* _tmp11_ = NULL;
-		GeeIterator* _tmp12_ = NULL;
+		GeeCollection* _tmp11_;
+		GeeIterator* _tmp12_;
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp11_ = to_publish;
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1478,21 +1468,21 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 		_media_it = _tmp12_;
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		while (TRUE) {
-#line 1482 "PublishingUI.c"
-			GeeIterator* _tmp13_ = NULL;
-			gboolean _tmp14_ = FALSE;
+#line 1472 "PublishingUI.c"
+			GeeIterator* _tmp13_;
+			gboolean _tmp14_;
 			MediaSource* media = NULL;
-			GeeIterator* _tmp15_ = NULL;
-			gpointer _tmp16_ = NULL;
+			GeeIterator* _tmp15_;
+			gpointer _tmp16_;
 			SpitPublishingPublishable* publishable = NULL;
-			MediaSource* _tmp17_ = NULL;
-			PublishingGlueMediaSourcePublishableWrapper* _tmp18_ = NULL;
-			SpitPublishingPublishable* _tmp19_ = NULL;
-			SpitPublishingPublisherMediaType _tmp20_ = 0;
-			SpitPublishingPublishable** _tmp23_ = NULL;
-			gint _tmp23__length1 = 0;
-			SpitPublishingPublishable* _tmp24_ = NULL;
-			SpitPublishingPublishable* _tmp25_ = NULL;
+			MediaSource* _tmp17_;
+			PublishingGlueMediaSourcePublishableWrapper* _tmp18_;
+			SpitPublishingPublishable* _tmp19_;
+			SpitPublishingPublisherMediaType _tmp20_;
+			SpitPublishingPublishable** _tmp23_;
+			gint _tmp23__length1;
+			SpitPublishingPublishable* _tmp24_;
+			SpitPublishingPublishable* _tmp25_;
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp13_ = _media_it;
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1501,7 +1491,7 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 			if (!_tmp14_) {
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				break;
-#line 1505 "PublishingUI.c"
+#line 1495 "PublishingUI.c"
 			}
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp15_ = _media_it;
@@ -1523,10 +1513,10 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 			if (_tmp20_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
 #line 182 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				has_photos = TRUE;
-#line 1527 "PublishingUI.c"
+#line 1517 "PublishingUI.c"
 			} else {
-				SpitPublishingPublishable* _tmp21_ = NULL;
-				SpitPublishingPublisherMediaType _tmp22_ = 0;
+				SpitPublishingPublishable* _tmp21_;
+				SpitPublishingPublisherMediaType _tmp22_;
 #line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp21_ = publishable;
 #line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1535,11 +1525,11 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 				if (_tmp22_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
 #line 184 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					has_videos = TRUE;
-#line 1539 "PublishingUI.c"
+#line 1529 "PublishingUI.c"
 				} else {
 #line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					g_assert_not_reached ();
-#line 1543 "PublishingUI.c"
+#line 1533 "PublishingUI.c"
 				}
 			}
 #line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1556,11 +1546,11 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 			_g_object_unref0 (publishable);
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_object_unref0 (media);
-#line 1560 "PublishingUI.c"
+#line 1550 "PublishingUI.c"
 		}
 #line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (_media_it);
-#line 1564 "PublishingUI.c"
+#line 1554 "PublishingUI.c"
 	}
 #line 191 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	title = NULL;
@@ -1570,626 +1560,605 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 	_tmp27_ = has_photos;
 #line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp27_) {
-#line 1574 "PublishingUI.c"
-		gboolean _tmp28_ = FALSE;
+#line 1564 "PublishingUI.c"
+		gboolean _tmp28_;
 #line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp28_ = has_videos;
 #line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp26_ = !_tmp28_;
-#line 1580 "PublishingUI.c"
+#line 1570 "PublishingUI.c"
 	} else {
 #line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp26_ = FALSE;
-#line 1584 "PublishingUI.c"
+#line 1574 "PublishingUI.c"
 	}
 #line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp26_) {
-#line 1588 "PublishingUI.c"
-		const gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		const gchar* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp29_ = _ ("Publish Photos");
+#line 1578 "PublishingUI.c"
+		gchar* _tmp29_;
+		gchar* _tmp30_;
 #line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp30_ = g_strdup (_tmp29_);
+		_tmp29_ = g_strdup (_ ("Publish Photos"));
 #line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_free0 (title);
 #line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		title = _tmp30_;
+		title = _tmp29_;
 #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp31_ = _ ("Publish photos _to:");
-#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp32_ = g_strdup (_tmp31_);
+		_tmp30_ = g_strdup (_ ("Publish photos _to:"));
 #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_free0 (label);
 #line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		label = _tmp32_;
-#line 1609 "PublishingUI.c"
+		label = _tmp30_;
+#line 1593 "PublishingUI.c"
 	} else {
-		gboolean _tmp33_ = FALSE;
-		gboolean _tmp34_ = FALSE;
+		gboolean _tmp31_ = FALSE;
+		gboolean _tmp32_;
 #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp34_ = has_photos;
+		_tmp32_ = has_photos;
 #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		if (!_tmp34_) {
-#line 1617 "PublishingUI.c"
-			gboolean _tmp35_ = FALSE;
+		if (!_tmp32_) {
+#line 1601 "PublishingUI.c"
+			gboolean _tmp33_;
 #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp35_ = has_videos;
+			_tmp33_ = has_videos;
 #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp33_ = _tmp35_;
-#line 1623 "PublishingUI.c"
+			_tmp31_ = _tmp33_;
+#line 1607 "PublishingUI.c"
 		} else {
 #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp33_ = FALSE;
-#line 1627 "PublishingUI.c"
+			_tmp31_ = FALSE;
+#line 1611 "PublishingUI.c"
 		}
 #line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		if (_tmp33_) {
-#line 1631 "PublishingUI.c"
-			const gchar* _tmp36_ = NULL;
-			gchar* _tmp37_ = NULL;
-			const gchar* _tmp38_ = NULL;
-			gchar* _tmp39_ = NULL;
-#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp36_ = _ ("Publish Videos");
+		if (_tmp31_) {
+#line 1615 "PublishingUI.c"
+			gchar* _tmp34_;
+			gchar* _tmp35_;
 #line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp37_ = g_strdup (_tmp36_);
+			_tmp34_ = g_strdup (_ ("Publish Videos"));
 #line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (title);
 #line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			title = _tmp37_;
-#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp38_ = _ ("Publish videos _to");
+			title = _tmp34_;
 #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp39_ = g_strdup (_tmp38_);
+			_tmp35_ = g_strdup (_ ("Publish videos _to"));
 #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (label);
 #line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			label = _tmp39_;
-#line 1652 "PublishingUI.c"
+			label = _tmp35_;
+#line 1630 "PublishingUI.c"
 		} else {
-			const gchar* _tmp40_ = NULL;
-			gchar* _tmp41_ = NULL;
-			const gchar* _tmp42_ = NULL;
-			gchar* _tmp43_ = NULL;
+			gchar* _tmp36_;
+			gchar* _tmp37_;
 #line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp40_ = _ ("Publish Photos and Videos");
-#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp41_ = g_strdup (_tmp40_);
+			_tmp36_ = g_strdup (_ ("Publish Photos and Videos"));
 #line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (title);
 #line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			title = _tmp41_;
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp42_ = _ ("Publish photos and videos _to");
+			title = _tmp36_;
 #line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp43_ = g_strdup (_tmp42_);
+			_tmp37_ = g_strdup (_ ("Publish photos and videos _to"));
 #line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (label);
 #line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			label = _tmp43_;
-#line 1674 "PublishingUI.c"
+			label = _tmp37_;
+#line 1646 "PublishingUI.c"
 		}
 	}
 #line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp44_ = title;
+	_tmp38_ = title;
 #line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp44_);
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp38_);
 #line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp45_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
+	_tmp39_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
 #line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->service_selector_box_model);
 #line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self->priv->service_selector_box_model = _tmp45_;
+	self->priv->service_selector_box_model = _tmp39_;
 #line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp46_ = self->priv->service_selector_box_model;
+	_tmp40_ = self->priv->service_selector_box_model;
 #line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp47_ = (GtkComboBox*) gtk_combo_box_new_with_model (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
+	_tmp41_ = (GtkComboBox*) gtk_combo_box_new_with_model (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
 #line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_object_ref_sink (_tmp47_);
+	g_object_ref_sink (_tmp41_);
 #line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->service_selector_box);
 #line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self->priv->service_selector_box = _tmp47_;
+	self->priv->service_selector_box = _tmp41_;
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp48_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
+	_tmp42_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_object_ref_sink (_tmp48_);
+	g_object_ref_sink (_tmp42_);
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	renderer_pix = _tmp48_;
+	renderer_pix = _tmp42_;
 #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp49_ = self->priv->service_selector_box;
+	_tmp43_ = self->priv->service_selector_box;
 #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp50_ = renderer_pix;
+	_tmp44_ = renderer_pix;
 #line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
+	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
 #line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp51_ = self->priv->service_selector_box;
+	_tmp45_ = self->priv->service_selector_box;
 #line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp52_ = renderer_pix;
+	_tmp46_ = renderer_pix;
 #line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
+	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
 #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp53_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+	_tmp47_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
 #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_object_ref_sink (_tmp53_);
+	g_object_ref_sink (_tmp47_);
 #line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	renderer_text = _tmp53_;
+	renderer_text = _tmp47_;
 #line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp54_ = self->priv->service_selector_box;
+	_tmp48_ = self->priv->service_selector_box;
 #line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp55_ = renderer_text;
+	_tmp49_ = renderer_text;
 #line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
+	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp56_ = self->priv->service_selector_box;
+	_tmp50_ = self->priv->service_selector_box;
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp57_ = renderer_text;
+	_tmp51_ = renderer_text;
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
+	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
 #line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp58_ = self->priv->service_selector_box;
+	_tmp52_ = self->priv->service_selector_box;
 #line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_combo_box_set_active (_tmp58_, 0);
+	gtk_combo_box_set_active (_tmp52_, 0);
 #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp59_ = config_facade_get_instance ();
+	_tmp53_ = config_facade_get_instance ();
 #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp60_ = _tmp59_;
+	_tmp54_ = _tmp53_;
 #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp61_ = configuration_facade_get_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp55_ = configuration_facade_get_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp62_ = _tmp61_;
+	_tmp56_ = _tmp55_;
 #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_g_object_unref0 (_tmp60_);
+	_g_object_unref0 (_tmp54_);
 #line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	last_used_service = _tmp62_;
+	last_used_service = _tmp56_;
 #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp63_ = has_photos;
+	_tmp57_ = has_photos;
 #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp64_ = has_videos;
+	_tmp58_ = has_videos;
 #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp66_ = publishing_ui_publishing_dialog_load_services (_tmp63_, _tmp64_, &_tmp65_);
+	_tmp60_ = publishing_ui_publishing_dialog_load_services (_tmp57_, _tmp58_, &_tmp59_);
 #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	loaded_services = _tmp66_;
+	loaded_services = _tmp60_;
 #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	loaded_services_length1 = _tmp65_;
+	loaded_services_length1 = _tmp59_;
 #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_loaded_services_size_ = loaded_services_length1;
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp67_ = loaded_services;
+	_tmp61_ = loaded_services;
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp67__length1 = loaded_services_length1;
-#line 1765 "PublishingUI.c"
+	_tmp61__length1 = loaded_services_length1;
+#line 1737 "PublishingUI.c"
 	{
 		SpitPublishingService** service_collection = NULL;
 		gint service_collection_length1 = 0;
 		gint _service_collection_size_ = 0;
 		gint service_it = 0;
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		service_collection = _tmp67_;
+		service_collection = _tmp61_;
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		service_collection_length1 = _tmp67__length1;
+		service_collection_length1 = _tmp61__length1;
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		for (service_it = 0; service_it < _tmp67__length1; service_it = service_it + 1) {
-#line 1777 "PublishingUI.c"
-			SpitPublishingService* _tmp68_ = NULL;
+		for (service_it = 0; service_it < _tmp61__length1; service_it = service_it + 1) {
+#line 1749 "PublishingUI.c"
+			SpitPublishingService* _tmp62_;
 			SpitPublishingService* service = NULL;
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp68_ = _g_object_ref0 (service_collection[service_it]);
+			_tmp62_ = _g_object_ref0 (service_collection[service_it]);
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			service = _tmp68_;
-#line 1784 "PublishingUI.c"
+			service = _tmp62_;
+#line 1756 "PublishingUI.c"
 			{
-				GtkListStore* _tmp69_ = NULL;
-				GtkTreeIter _tmp70_ = {0};
+				GtkListStore* _tmp63_;
+				GtkTreeIter _tmp64_ = {0};
 				gchar* curr_service_id = NULL;
-				SpitPublishingService* _tmp71_ = NULL;
-				const gchar* _tmp72_ = NULL;
-				gchar* _tmp73_ = NULL;
-				SpitPublishingService* _tmp74_ = NULL;
-				gboolean _tmp75_ = FALSE;
-				SpitPluggableInfo _tmp76_ = {0};
-				GdkPixbuf** _tmp77_ = NULL;
-				gint _tmp77__length1 = 0;
-				const gchar* _tmp95_ = NULL;
+				SpitPublishingService* _tmp65_;
+				const gchar* _tmp66_;
+				gchar* _tmp67_;
+				SpitPublishingService* _tmp68_;
+				gboolean _tmp69_ = FALSE;
+				SpitPluggableInfo _tmp70_;
+				GdkPixbuf** _tmp71_;
+				gint _tmp71__length1;
+				const gchar* _tmp89_;
 #line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp69_ = self->priv->service_selector_box_model;
+				_tmp63_ = self->priv->service_selector_box_model;
 #line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				gtk_list_store_append (_tmp69_, &_tmp70_);
+				gtk_list_store_append (_tmp63_, &_tmp64_);
 #line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				iter = _tmp70_;
+				iter = _tmp64_;
 #line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp71_ = service;
+				_tmp65_ = service;
 #line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp72_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+				_tmp66_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp73_ = g_strdup (_tmp72_);
+				_tmp67_ = g_strdup (_tmp66_);
 #line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				curr_service_id = _tmp73_;
+				curr_service_id = _tmp67_;
 #line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp74_ = service;
+				_tmp68_ = service;
 #line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				spit_pluggable_get_info (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, SPIT_TYPE_PLUGGABLE, SpitPluggable), &self->priv->info);
+				spit_pluggable_get_info (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, SPIT_TYPE_PLUGGABLE, SpitPluggable), &self->priv->info);
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp76_ = self->priv->info;
+				_tmp70_ = self->priv->info;
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp77_ = _tmp76_.icons;
+				_tmp71_ = _tmp70_.icons;
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp77__length1 = _tmp76_.icons_length1;
+				_tmp71__length1 = _tmp70_.icons_length1;
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				if (NULL != _tmp77_) {
-#line 1824 "PublishingUI.c"
-					SpitPluggableInfo _tmp78_ = {0};
-					GdkPixbuf** _tmp79_ = NULL;
-					gint _tmp79__length1 = 0;
+				if (NULL != _tmp71_) {
+#line 1796 "PublishingUI.c"
+					SpitPluggableInfo _tmp72_;
+					GdkPixbuf** _tmp73_;
+					gint _tmp73__length1;
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp78_ = self->priv->info;
+					_tmp72_ = self->priv->info;
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp79_ = _tmp78_.icons;
+					_tmp73_ = _tmp72_.icons;
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp79__length1 = _tmp78_.icons_length1;
+					_tmp73__length1 = _tmp72_.icons_length1;
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp75_ = 0 < _tmp79__length1;
-#line 1836 "PublishingUI.c"
+					_tmp69_ = 0 < _tmp73__length1;
+#line 1808 "PublishingUI.c"
 				} else {
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp75_ = FALSE;
-#line 1840 "PublishingUI.c"
+					_tmp69_ = FALSE;
+#line 1812 "PublishingUI.c"
 				}
 #line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				if (_tmp75_) {
-#line 1844 "PublishingUI.c"
-					GtkListStore* _tmp80_ = NULL;
-					GtkTreeIter _tmp81_ = {0};
-					SpitPluggableInfo _tmp82_ = {0};
-					GdkPixbuf** _tmp83_ = NULL;
-					gint _tmp83__length1 = 0;
-					GdkPixbuf* _tmp84_ = NULL;
-					SpitPublishingService* _tmp85_ = NULL;
-					const gchar* _tmp86_ = NULL;
-					GdkPixbuf* _tmp87_ = NULL;
-					GdkPixbuf* _tmp88_ = NULL;
+				if (_tmp69_) {
+#line 1816 "PublishingUI.c"
+					GtkListStore* _tmp74_;
+					GtkTreeIter _tmp75_;
+					SpitPluggableInfo _tmp76_;
+					GdkPixbuf** _tmp77_;
+					gint _tmp77__length1;
+					GdkPixbuf* _tmp78_;
+					SpitPublishingService* _tmp79_;
+					const gchar* _tmp80_;
+					GdkPixbuf* _tmp81_;
+					GdkPixbuf* _tmp82_;
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp80_ = self->priv->service_selector_box_model;
+					_tmp74_ = self->priv->service_selector_box_model;
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp81_ = iter;
+					_tmp75_ = iter;
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp82_ = self->priv->info;
+					_tmp76_ = self->priv->info;
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp83_ = _tmp82_.icons;
+					_tmp77_ = _tmp76_.icons;
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp83__length1 = _tmp82_.icons_length1;
+					_tmp77__length1 = _tmp76_.icons_length1;
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp84_ = _tmp83_[0];
+					_tmp78_ = _tmp77_[0];
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp85_ = service;
+					_tmp79_ = service;
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp86_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+					_tmp80_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					gtk_list_store_set (_tmp80_, &_tmp81_, 0, _tmp84_, 1, _tmp86_, -1);
+					gtk_list_store_set (_tmp74_, &_tmp75_, 0, _tmp78_, 1, _tmp80_, -1);
 #line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp87_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
+					_tmp81_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
 #line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_object_unref0 (self->priv->info.icons[0]);
 #line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					self->priv->info.icons[0] = _tmp87_;
+					self->priv->info.icons[0] = _tmp81_;
 #line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp88_ = self->priv->info.icons[0];
-#line 1881 "PublishingUI.c"
+					_tmp82_ = self->priv->info.icons[0];
+#line 1853 "PublishingUI.c"
 				} else {
-					GtkListStore* _tmp89_ = NULL;
-					GtkTreeIter _tmp90_ = {0};
-					GdkPixbuf* _tmp91_ = NULL;
-					GdkPixbuf* _tmp92_ = NULL;
-					SpitPublishingService* _tmp93_ = NULL;
-					const gchar* _tmp94_ = NULL;
+					GtkListStore* _tmp83_;
+					GtkTreeIter _tmp84_;
+					GdkPixbuf* _tmp85_;
+					GdkPixbuf* _tmp86_;
+					SpitPublishingService* _tmp87_;
+					const gchar* _tmp88_;
 #line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp89_ = self->priv->service_selector_box_model;
+					_tmp83_ = self->priv->service_selector_box_model;
 #line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp90_ = iter;
+					_tmp84_ = iter;
 #line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp91_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
+					_tmp85_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
 #line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp92_ = _tmp91_;
+					_tmp86_ = _tmp85_;
 #line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp93_ = service;
+					_tmp87_ = service;
 #line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp94_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+					_tmp88_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					gtk_list_store_set (_tmp89_, &_tmp90_, 0, _tmp92_, 1, _tmp94_, -1);
+					gtk_list_store_set (_tmp83_, &_tmp84_, 0, _tmp86_, 1, _tmp88_, -1);
 #line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_g_object_unref0 (_tmp92_);
-#line 1905 "PublishingUI.c"
+					_g_object_unref0 (_tmp86_);
+#line 1877 "PublishingUI.c"
 				}
 #line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp95_ = last_used_service;
+				_tmp89_ = last_used_service;
 #line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				if (_tmp95_ == NULL) {
-#line 1911 "PublishingUI.c"
-					GtkComboBox* _tmp96_ = NULL;
-					GtkTreeIter _tmp97_ = {0};
-					SpitPublishingService* _tmp98_ = NULL;
-					const gchar* _tmp99_ = NULL;
-					gchar* _tmp100_ = NULL;
+				if (_tmp89_ == NULL) {
+#line 1883 "PublishingUI.c"
+					GtkComboBox* _tmp90_;
+					GtkTreeIter _tmp91_;
+					SpitPublishingService* _tmp92_;
+					const gchar* _tmp93_;
+					gchar* _tmp94_;
 #line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp96_ = self->priv->service_selector_box;
+					_tmp90_ = self->priv->service_selector_box;
 #line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp97_ = iter;
+					_tmp91_ = iter;
 #line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					gtk_combo_box_set_active_iter (_tmp96_, &_tmp97_);
+					gtk_combo_box_set_active_iter (_tmp90_, &_tmp91_);
 #line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp98_ = service;
+					_tmp92_ = service;
 #line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp99_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+					_tmp93_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
 #line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp100_ = g_strdup (_tmp99_);
+					_tmp94_ = g_strdup (_tmp93_);
 #line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_free0 (last_used_service);
 #line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					last_used_service = _tmp100_;
-#line 1933 "PublishingUI.c"
+					last_used_service = _tmp94_;
+#line 1905 "PublishingUI.c"
 				} else {
-					const gchar* _tmp101_ = NULL;
-					const gchar* _tmp102_ = NULL;
+					const gchar* _tmp95_;
+					const gchar* _tmp96_;
 #line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp101_ = last_used_service;
+					_tmp95_ = last_used_service;
 #line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					_tmp102_ = curr_service_id;
+					_tmp96_ = curr_service_id;
 #line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-					if (g_strcmp0 (_tmp101_, _tmp102_) == 0) {
-#line 1943 "PublishingUI.c"
-						GtkComboBox* _tmp103_ = NULL;
-						GtkTreeIter _tmp104_ = {0};
+					if (g_strcmp0 (_tmp95_, _tmp96_) == 0) {
+#line 1915 "PublishingUI.c"
+						GtkComboBox* _tmp97_;
+						GtkTreeIter _tmp98_;
 #line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-						_tmp103_ = self->priv->service_selector_box;
+						_tmp97_ = self->priv->service_selector_box;
 #line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-						_tmp104_ = iter;
+						_tmp98_ = iter;
 #line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-						gtk_combo_box_set_active_iter (_tmp103_, &_tmp104_);
-#line 1952 "PublishingUI.c"
+						gtk_combo_box_set_active_iter (_tmp97_, &_tmp98_);
+#line 1924 "PublishingUI.c"
 					}
 				}
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_free0 (curr_service_id);
 #line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (service);
-#line 1959 "PublishingUI.c"
+#line 1931 "PublishingUI.c"
 			}
 		}
 	}
 #line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp105_ = self->priv->service_selector_box;
+	_tmp99_ = self->priv->service_selector_box;
 #line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_signal_connect_object (_tmp105_, "changed", (GCallback) _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
+	g_signal_connect_object (_tmp99_, "changed", (GCallback) _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
 #line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp106_ = use_header;
+	_tmp100_ = use_header;
 #line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	if (!_tmp106_) {
-#line 1971 "PublishingUI.c"
+	if (!_tmp100_) {
+#line 1943 "PublishingUI.c"
 		GtkLabel* service_selector_box_label = NULL;
-		const gchar* _tmp107_ = NULL;
-		GtkLabel* _tmp108_ = NULL;
-		GtkLabel* _tmp109_ = NULL;
-		GtkComboBox* _tmp110_ = NULL;
-		GtkLabel* _tmp111_ = NULL;
-		GtkLabel* _tmp112_ = NULL;
-		GtkComboBox* _tmp113_ = NULL;
-		GtkComboBox* _tmp114_ = NULL;
-		GtkComboBox* _tmp115_ = NULL;
-		GtkComboBox* _tmp116_ = NULL;
+		const gchar* _tmp101_;
+		GtkLabel* _tmp102_;
+		GtkLabel* _tmp103_;
+		GtkComboBox* _tmp104_;
+		GtkLabel* _tmp105_;
+		GtkLabel* _tmp106_;
+		GtkComboBox* _tmp107_;
+		GtkComboBox* _tmp108_;
+		GtkComboBox* _tmp109_;
+		GtkComboBox* _tmp110_;
 		GtkBox* service_selector_layouter = NULL;
-		GtkBox* _tmp117_ = NULL;
-		GtkBox* _tmp118_ = NULL;
-		GtkBox* _tmp119_ = NULL;
-		GtkBox* _tmp120_ = NULL;
-		GtkLabel* _tmp121_ = NULL;
-		GtkBox* _tmp122_ = NULL;
-		GtkComboBox* _tmp123_ = NULL;
+		GtkBox* _tmp111_;
+		GtkBox* _tmp112_;
+		GtkBox* _tmp113_;
+		GtkBox* _tmp114_;
+		GtkLabel* _tmp115_;
+		GtkBox* _tmp116_;
+		GtkComboBox* _tmp117_;
 		GtkBox* service_area_layouter = NULL;
-		GtkBox* _tmp124_ = NULL;
-		GtkBox* _tmp125_ = NULL;
-		GtkBox* _tmp126_ = NULL;
-		GtkBox* _tmp127_ = NULL;
-		GtkSeparator* _tmp128_ = NULL;
-		GtkSeparator* _tmp129_ = NULL;
-		GtkBox* _tmp130_ = NULL;
-		GtkBox* _tmp131_ = NULL;
-		GtkBox* _tmp132_ = NULL;
-		GtkBox* _tmp133_ = NULL;
-		GtkBox* _tmp134_ = NULL;
-		GtkBox* _tmp135_ = NULL;
+		GtkBox* _tmp118_;
+		GtkBox* _tmp119_;
+		GtkBox* _tmp120_;
+		GtkBox* _tmp121_;
+		GtkSeparator* _tmp122_;
+		GtkSeparator* _tmp123_;
+		GtkBox* _tmp124_;
+		GtkBox* _tmp125_;
+		GtkBox* _tmp126_;
+		GtkBox* _tmp127_;
+		GtkBox* _tmp128_;
+		GtkBox* _tmp129_;
 #line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp107_ = label;
+		_tmp101_ = label;
 #line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp108_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp107_);
+		_tmp102_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp101_);
 #line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		g_object_ref_sink (_tmp108_);
+		g_object_ref_sink (_tmp102_);
 #line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		service_selector_box_label = _tmp108_;
+		service_selector_box_label = _tmp102_;
 #line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp109_ = service_selector_box_label;
+		_tmp103_ = service_selector_box_label;
 #line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp110_ = self->priv->service_selector_box;
+		_tmp104_ = self->priv->service_selector_box;
 #line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_label_set_mnemonic_widget (_tmp109_, G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget));
+		gtk_label_set_mnemonic_widget (_tmp103_, G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, gtk_widget_get_type (), GtkWidget));
 #line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp111_ = service_selector_box_label;
+		_tmp105_ = service_selector_box_label;
 #line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp112_ = service_selector_box_label;
+		_tmp106_ = service_selector_box_label;
 #line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 267 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp113_ = self->priv->service_selector_box;
+		_tmp107_ = self->priv->service_selector_box;
 #line 267 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp113_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
+		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
 #line 268 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp114_ = self->priv->service_selector_box;
+		_tmp108_ = self->priv->service_selector_box;
 #line 268 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp115_ = self->priv->service_selector_box;
+		_tmp109_ = self->priv->service_selector_box;
 #line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, gtk_widget_get_type (), GtkWidget), FALSE);
+		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp116_ = self->priv->service_selector_box;
+		_tmp110_ = self->priv->service_selector_box;
 #line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_widget_get_type (), GtkWidget), FALSE);
+		gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp117_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+		_tmp111_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
 #line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		g_object_ref_sink (_tmp117_);
+		g_object_ref_sink (_tmp111_);
 #line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		service_selector_layouter = _tmp117_;
+		service_selector_layouter = _tmp111_;
 #line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp118_ = service_selector_layouter;
+		_tmp112_ = service_selector_layouter;
 #line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, gtk_container_get_type (), GtkContainer), (guint) 12);
+		gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_container_get_type (), GtkContainer), (guint) 12);
 #line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp119_ = service_selector_layouter;
+		_tmp113_ = service_selector_layouter;
 #line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, gtk_widget_get_type (), GtkWidget), TRUE);
+		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp113_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp120_ = service_selector_layouter;
+		_tmp114_ = service_selector_layouter;
 #line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp121_ = service_selector_box_label;
+		_tmp115_ = service_selector_box_label;
 #line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget));
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, gtk_widget_get_type (), GtkWidget));
 #line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp122_ = service_selector_layouter;
+		_tmp116_ = service_selector_layouter;
 #line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp123_ = self->priv->service_selector_box;
+		_tmp117_ = self->priv->service_selector_box;
 #line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_box_pack_start (_tmp122_, G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+		gtk_box_pack_start (_tmp116_, G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp124_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+		_tmp118_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 #line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		g_object_ref_sink (_tmp124_);
+		g_object_ref_sink (_tmp118_);
 #line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		service_area_layouter = _tmp124_;
+		service_area_layouter = _tmp118_;
 #line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp125_ = service_area_layouter;
+		_tmp119_ = service_area_layouter;
 #line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp126_ = service_selector_layouter;
+		_tmp120_ = service_selector_layouter;
 #line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, gtk_widget_get_type (), GtkWidget));
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, gtk_widget_get_type (), GtkWidget));
 #line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp127_ = service_area_layouter;
+		_tmp121_ = service_area_layouter;
 #line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp128_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+		_tmp122_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
 #line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		g_object_ref_sink (_tmp128_);
+		g_object_ref_sink (_tmp122_);
 #line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp129_ = _tmp128_;
+		_tmp123_ = _tmp122_;
 #line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, gtk_widget_get_type (), GtkWidget));
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_widget_get_type (), GtkWidget));
 #line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_g_object_unref0 (_tmp129_);
+		_g_object_unref0 (_tmp123_);
 #line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp130_ = service_area_layouter;
+		_tmp124_ = service_area_layouter;
 #line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
 #line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp131_ = service_area_layouter;
+		_tmp125_ = service_area_layouter;
 #line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp132_ = service_area_layouter;
+		_tmp126_ = service_area_layouter;
 #line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget), TRUE);
+		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp133_ = service_area_layouter;
+		_tmp127_ = service_area_layouter;
 #line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, gtk_widget_get_type (), GtkWidget), FALSE);
+		gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp134_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+		_tmp128_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp135_ = service_area_layouter;
+		_tmp129_ = service_area_layouter;
 #line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_box_pack_start (_tmp134_, G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+		gtk_box_pack_start (_tmp128_, G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (service_area_layouter);
 #line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (service_selector_layouter);
 #line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (service_selector_box_label);
-#line 2120 "PublishingUI.c"
+#line 2092 "PublishingUI.c"
 	}
 #line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp136_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	_tmp130_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 #line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_object_ref_sink (_tmp136_);
+	g_object_ref_sink (_tmp130_);
 #line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->central_area_layouter);
 #line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self->priv->central_area_layouter = _tmp136_;
+	self->priv->central_area_layouter = _tmp130_;
 #line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp137_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+	_tmp131_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp138_ = self->priv->central_area_layouter;
+	_tmp132_ = self->priv->central_area_layouter;
 #line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_box_pack_start (_tmp137_, G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (_tmp131_, G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp139_ = use_header;
+	_tmp133_ = use_header;
 #line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	if (_tmp139_) {
-#line 2140 "PublishingUI.c"
-		GtkButton* _tmp140_ = NULL;
-		GtkButton* _tmp141_ = NULL;
-		GtkWidget* _tmp142_ = NULL;
-		GtkButton* _tmp143_ = NULL;
-		GtkWidget* _tmp144_ = NULL;
-		GtkComboBox* _tmp145_ = NULL;
+	if (_tmp133_) {
+#line 2112 "PublishingUI.c"
+		GtkButton* _tmp134_;
+		GtkButton* _tmp135_;
+		GtkWidget* _tmp136_;
+		GtkButton* _tmp137_;
+		GtkWidget* _tmp138_;
+		GtkComboBox* _tmp139_;
 #line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp140_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
+		_tmp134_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
 #line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		g_object_ref_sink (_tmp140_);
+		g_object_ref_sink (_tmp134_);
 #line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (self->priv->close_cancel_button);
 #line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		self->priv->close_cancel_button = _tmp140_;
+		self->priv->close_cancel_button = _tmp134_;
 #line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp141_ = self->priv->close_cancel_button;
+		_tmp135_ = self->priv->close_cancel_button;
 #line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, gtk_widget_get_type (), GtkWidget), TRUE);
+		gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp142_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+		_tmp136_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp143_ = self->priv->close_cancel_button;
+		_tmp137_ = self->priv->close_cancel_button;
 #line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_widget_get_type (), GtkWidget));
+		gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp136_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, gtk_widget_get_type (), GtkWidget));
 #line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp144_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+		_tmp138_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp145_ = self->priv->service_selector_box;
+		_tmp139_ = self->priv->service_selector_box;
 #line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp145_, gtk_widget_get_type (), GtkWidget));
-#line 2171 "PublishingUI.c"
+		gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, gtk_widget_get_type (), GtkWidget));
+#line 2143 "PublishingUI.c"
 	} else {
-		const gchar* _tmp146_ = NULL;
-		GtkWidget* _tmp147_ = NULL;
-		GtkButton* _tmp148_ = NULL;
+		GtkWidget* _tmp140_;
+		GtkButton* _tmp141_;
 #line 303 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp146_ = _ ("_Cancel");
-#line 303 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _tmp146_, (gint) GTK_RESPONSE_CANCEL);
+		gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _ ("_Cancel"), (gint) GTK_RESPONSE_CANCEL);
 #line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp147_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
+		_tmp140_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
 #line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp148_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp147_, gtk_button_get_type ()) ? ((GtkButton*) _tmp147_) : NULL);
+		_tmp141_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp140_, gtk_button_get_type ()) ? ((GtkButton*) _tmp140_) : NULL);
 #line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (self->priv->close_cancel_button);
 #line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		self->priv->close_cancel_button = _tmp148_;
-#line 2188 "PublishingUI.c"
+		self->priv->close_cancel_button = _tmp141_;
+#line 2157 "PublishingUI.c"
 	}
 #line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp149_ = self->priv->close_cancel_button;
+	_tmp142_ = self->priv->close_cancel_button;
 #line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_signal_connect_object (_tmp149_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp142_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
 #line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_set_standard_window_mode (self);
 #line 310 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2208,41 +2177,41 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 	_g_free0 (title);
 #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 2212 "PublishingUI.c"
+#line 2181 "PublishingUI.c"
 }
 
 
 PublishingUIPublishingDialog* publishing_ui_publishing_dialog_new (GeeCollection* to_publish) {
 #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_publishing_dialog_construct (PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, to_publish);
-#line 2219 "PublishingUI.c"
+#line 2188 "PublishingUI.c"
 }
 
 
-static void _vala_array_add56 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
+static void _vala_array_add56 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
 #line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
 #line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2230 "PublishingUI.c"
+#line 2199 "PublishingUI.c"
 	}
 #line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
 #line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2236 "PublishingUI.c"
+#line 2205 "PublishingUI.c"
 }
 
 
 static gint __lambda15_ (void* a, void* b) {
 	gint result = 0;
-	void* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	void* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
+	void* _tmp0_;
+	const gchar* _tmp1_;
+	void* _tmp2_;
+	const gchar* _tmp3_;
+	gint _tmp4_;
 #line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = a;
 #line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2257,7 +2226,7 @@ static gint __lambda15_ (void* a, void* b) {
 	result = _tmp4_;
 #line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2261 "PublishingUI.c"
+#line 2230 "PublishingUI.c"
 }
 
 
@@ -2266,27 +2235,27 @@ static gint ___lambda15____compar_fn_t (void* key1, void* key2) {
 	result = __lambda15_ (key1, key2);
 #line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2270 "PublishingUI.c"
+#line 2239 "PublishingUI.c"
 }
 
 
 static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services (int* result_length1) {
 	SpitPublishingService** result = NULL;
 	SpitPublishingService** loaded_services = NULL;
-	SpitPublishingService** _tmp0_ = NULL;
-	gint loaded_services_length1 = 0;
-	gint _loaded_services_size_ = 0;
+	SpitPublishingService** _tmp0_;
+	gint loaded_services_length1;
+	gint _loaded_services_size_;
 	GeeCollection* pluggables = NULL;
-	GeeCollection* _tmp1_ = NULL;
-	GeeCollection* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	SpitPublishingService** _tmp25_ = NULL;
-	gint _tmp25__length1 = 0;
-	SpitPublishingService** _tmp26_ = NULL;
-	gint _tmp26__length1 = 0;
-	SpitPublishingService** _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
+	GeeCollection* _tmp1_;
+	GeeCollection* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	SpitPublishingService** _tmp25_;
+	gint _tmp25__length1;
+	SpitPublishingService** _tmp26_;
+	gint _tmp26__length1;
+	SpitPublishingService** _tmp27_;
+	gint _tmp27__length1;
 #line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = g_new0 (SpitPublishingService*, 0 + 1);
 #line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2308,11 +2277,11 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 #line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_debug ("PublishingUI.vala:320: PublisingDialog: discovered %d pluggable publis" \
 "hing services.", _tmp4_);
-#line 2311 "PublishingUI.c"
+#line 2280 "PublishingUI.c"
 	{
 		GeeIterator* _pluggable_it = NULL;
-		GeeCollection* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
+		GeeCollection* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp5_ = pluggables;
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2321,25 +2290,25 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 		_pluggable_it = _tmp6_;
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		while (TRUE) {
-#line 2324 "PublishingUI.c"
-			GeeIterator* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+#line 2293 "PublishingUI.c"
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			SpitPluggable* pluggable = NULL;
-			GeeIterator* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
 			gint pluggable_interface = 0;
-			SpitPluggable* _tmp11_ = NULL;
-			gint _tmp12_ = 0;
-			gint _tmp13_ = 0;
+			SpitPluggable* _tmp11_;
+			gint _tmp12_;
+			gint _tmp13_;
 			SpitPublishingService* service = NULL;
-			SpitPluggable* _tmp18_ = NULL;
-			SpitPublishingService* _tmp19_ = NULL;
-			SpitPublishingService* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
-			SpitPublishingService** _tmp22_ = NULL;
-			gint _tmp22__length1 = 0;
-			SpitPublishingService* _tmp23_ = NULL;
-			SpitPublishingService* _tmp24_ = NULL;
+			SpitPluggable* _tmp18_;
+			SpitPublishingService* _tmp19_;
+			SpitPublishingService* _tmp20_;
+			const gchar* _tmp21_;
+			SpitPublishingService** _tmp22_;
+			gint _tmp22__length1;
+			SpitPublishingService* _tmp23_;
+			SpitPublishingService* _tmp24_;
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = _pluggable_it;
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2348,7 +2317,7 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 			if (!_tmp8_) {
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				break;
-#line 2351 "PublishingUI.c"
+#line 2320 "PublishingUI.c"
 			}
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp9_ = _pluggable_it;
@@ -2366,11 +2335,11 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 			_tmp13_ = pluggable_interface;
 #line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			if (_tmp13_ != SPIT_PUBLISHING_CURRENT_INTERFACE) {
-#line 2369 "PublishingUI.c"
-				SpitPluggable* _tmp14_ = NULL;
-				gchar* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
-				gint _tmp17_ = 0;
+#line 2338 "PublishingUI.c"
+				SpitPluggable* _tmp14_;
+				gchar* _tmp15_;
+				gchar* _tmp16_;
+				gint _tmp17_;
 #line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp14_ = pluggable;
 #line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2388,7 +2357,7 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 				_g_object_unref0 (pluggable);
 #line 329 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				continue;
-#line 2390 "PublishingUI.c"
+#line 2359 "PublishingUI.c"
 			}
 #line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp18_ = pluggable;
@@ -2417,11 +2386,11 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 			_g_object_unref0 (service);
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_object_unref0 (pluggable);
-#line 2418 "PublishingUI.c"
+#line 2387 "PublishingUI.c"
 		}
 #line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (_pluggable_it);
-#line 2422 "PublishingUI.c"
+#line 2391 "PublishingUI.c"
 	}
 #line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp25_ = loaded_services;
@@ -2441,7 +2410,7 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 	if (result_length1) {
 #line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*result_length1 = _tmp27__length1;
-#line 2442 "PublishingUI.c"
+#line 2411 "PublishingUI.c"
 	}
 #line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _tmp27_;
@@ -2449,92 +2418,92 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 	_g_object_unref0 (pluggables);
 #line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2450 "PublishingUI.c"
+#line 2419 "PublishingUI.c"
 }
 
 
-static void _vala_array_add57 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
+static void _vala_array_add57 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
 #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
 #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2461 "PublishingUI.c"
+#line 2430 "PublishingUI.c"
 	}
 #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
 #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2467 "PublishingUI.c"
+#line 2436 "PublishingUI.c"
 }
 
 
-static void _vala_array_add58 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
+static void _vala_array_add58 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
 #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
 #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2478 "PublishingUI.c"
+#line 2447 "PublishingUI.c"
 	}
 #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
 #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2484 "PublishingUI.c"
+#line 2453 "PublishingUI.c"
 }
 
 
-static void _vala_array_add59 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
+static void _vala_array_add59 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
 #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
 #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2495 "PublishingUI.c"
+#line 2464 "PublishingUI.c"
 	}
 #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
 #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2501 "PublishingUI.c"
+#line 2470 "PublishingUI.c"
 }
 
 
 static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gboolean has_photos, gboolean has_videos, int* result_length1) {
 	SpitPublishingService** result = NULL;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	SpitPublishingService** filtered_services = NULL;
-	SpitPublishingService** _tmp3_ = NULL;
-	gint filtered_services_length1 = 0;
-	gint _filtered_services_size_ = 0;
+	SpitPublishingService** _tmp3_;
+	gint filtered_services_length1;
+	gint _filtered_services_size_;
 	SpitPublishingService** all_services = NULL;
-	gint _tmp4_ = 0;
-	SpitPublishingService** _tmp5_ = NULL;
-	gint all_services_length1 = 0;
-	gint _all_services_size_ = 0;
-	SpitPublishingService** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	SpitPublishingService** _tmp32_ = NULL;
-	gint _tmp32__length1 = 0;
+	gint _tmp4_;
+	SpitPublishingService** _tmp5_;
+	gint all_services_length1;
+	gint _all_services_size_;
+	SpitPublishingService** _tmp6_;
+	gint _tmp6__length1;
+	SpitPublishingService** _tmp32_;
+	gint _tmp32__length1;
 #line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = has_photos;
 #line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp1_) {
 #line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp0_ = TRUE;
-#line 2528 "PublishingUI.c"
+#line 2497 "PublishingUI.c"
 	} else {
-		gboolean _tmp2_ = FALSE;
+		gboolean _tmp2_;
 #line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp2_ = has_videos;
 #line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp0_ = _tmp2_;
-#line 2535 "PublishingUI.c"
+#line 2504 "PublishingUI.c"
 	}
 #line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_vala_assert (_tmp0_, "has_photos || has_videos");
@@ -2558,7 +2527,7 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
 	_tmp6_ = all_services;
 #line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp6__length1 = all_services_length1;
-#line 2559 "PublishingUI.c"
+#line 2528 "PublishingUI.c"
 	{
 		SpitPublishingService** service_collection = NULL;
 		gint service_collection_length1 = 0;
@@ -2570,49 +2539,49 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
 		service_collection_length1 = _tmp6__length1;
 #line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		for (service_it = 0; service_it < _tmp6__length1; service_it = service_it + 1) {
-#line 2571 "PublishingUI.c"
-			SpitPublishingService* _tmp7_ = NULL;
+#line 2540 "PublishingUI.c"
+			SpitPublishingService* _tmp7_;
 			SpitPublishingService* service = NULL;
 #line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = _g_object_ref0 (service_collection[service_it]);
 #line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			service = _tmp7_;
-#line 2578 "PublishingUI.c"
+#line 2547 "PublishingUI.c"
 			{
 				gboolean _tmp8_ = FALSE;
-				gboolean _tmp9_ = FALSE;
+				gboolean _tmp9_;
 #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp9_ = has_photos;
 #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp9_) {
-#line 2586 "PublishingUI.c"
-					gboolean _tmp10_ = FALSE;
+#line 2555 "PublishingUI.c"
+					gboolean _tmp10_;
 #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp10_ = has_videos;
 #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp8_ = !_tmp10_;
-#line 2592 "PublishingUI.c"
+#line 2561 "PublishingUI.c"
 				} else {
 #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp8_ = FALSE;
-#line 2596 "PublishingUI.c"
+#line 2565 "PublishingUI.c"
 				}
 #line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp8_) {
-#line 2600 "PublishingUI.c"
-					SpitPublishingService* _tmp11_ = NULL;
-					SpitPublishingPublisherMediaType _tmp12_ = 0;
+#line 2569 "PublishingUI.c"
+					SpitPublishingService* _tmp11_;
+					SpitPublishingPublisherMediaType _tmp12_;
 #line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp11_ = service;
 #line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp12_ = spit_publishing_service_get_supported_media (_tmp11_);
 #line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if ((_tmp12_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 2609 "PublishingUI.c"
-						SpitPublishingService** _tmp13_ = NULL;
-						gint _tmp13__length1 = 0;
-						SpitPublishingService* _tmp14_ = NULL;
-						SpitPublishingService* _tmp15_ = NULL;
+#line 2578 "PublishingUI.c"
+						SpitPublishingService** _tmp13_;
+						gint _tmp13__length1;
+						SpitPublishingService* _tmp14_;
+						SpitPublishingService* _tmp15_;
 #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp13_ = filtered_services;
 #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2623,43 +2592,43 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
 						_tmp15_ = _g_object_ref0 (_tmp14_);
 #line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_vala_array_add57 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp15_);
-#line 2624 "PublishingUI.c"
+#line 2593 "PublishingUI.c"
 					}
 				} else {
 					gboolean _tmp16_ = FALSE;
-					gboolean _tmp17_ = FALSE;
+					gboolean _tmp17_;
 #line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp17_ = has_photos;
 #line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if (!_tmp17_) {
-#line 2633 "PublishingUI.c"
-						gboolean _tmp18_ = FALSE;
+#line 2602 "PublishingUI.c"
+						gboolean _tmp18_;
 #line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp18_ = has_videos;
 #line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp16_ = _tmp18_;
-#line 2639 "PublishingUI.c"
+#line 2608 "PublishingUI.c"
 					} else {
 #line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp16_ = FALSE;
-#line 2643 "PublishingUI.c"
+#line 2612 "PublishingUI.c"
 					}
 #line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if (_tmp16_) {
-#line 2647 "PublishingUI.c"
-						SpitPublishingService* _tmp19_ = NULL;
-						SpitPublishingPublisherMediaType _tmp20_ = 0;
+#line 2616 "PublishingUI.c"
+						SpitPublishingService* _tmp19_;
+						SpitPublishingPublisherMediaType _tmp20_;
 #line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp19_ = service;
 #line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp20_ = spit_publishing_service_get_supported_media (_tmp19_);
 #line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						if ((_tmp20_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0) {
-#line 2656 "PublishingUI.c"
-							SpitPublishingService** _tmp21_ = NULL;
-							gint _tmp21__length1 = 0;
-							SpitPublishingService* _tmp22_ = NULL;
-							SpitPublishingService* _tmp23_ = NULL;
+#line 2625 "PublishingUI.c"
+							SpitPublishingService** _tmp21_;
+							gint _tmp21__length1;
+							SpitPublishingService* _tmp22_;
+							SpitPublishingService* _tmp23_;
 #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp21_ = filtered_services;
 #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2670,40 +2639,40 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
 							_tmp23_ = _g_object_ref0 (_tmp22_);
 #line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_vala_array_add58 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp23_);
-#line 2671 "PublishingUI.c"
+#line 2640 "PublishingUI.c"
 						}
 					} else {
 						gboolean _tmp24_ = FALSE;
-						SpitPublishingService* _tmp25_ = NULL;
-						SpitPublishingPublisherMediaType _tmp26_ = 0;
+						SpitPublishingService* _tmp25_;
+						SpitPublishingPublisherMediaType _tmp26_;
 #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp25_ = service;
 #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp26_ = spit_publishing_service_get_supported_media (_tmp25_);
 #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						if ((_tmp26_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 2683 "PublishingUI.c"
-							SpitPublishingService* _tmp27_ = NULL;
-							SpitPublishingPublisherMediaType _tmp28_ = 0;
+#line 2652 "PublishingUI.c"
+							SpitPublishingService* _tmp27_;
+							SpitPublishingPublisherMediaType _tmp28_;
 #line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp27_ = service;
 #line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp28_ = spit_publishing_service_get_supported_media (_tmp27_);
 #line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp24_ = (_tmp28_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
-#line 2692 "PublishingUI.c"
+#line 2661 "PublishingUI.c"
 						} else {
 #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp24_ = FALSE;
-#line 2696 "PublishingUI.c"
+#line 2665 "PublishingUI.c"
 						}
 #line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						if (_tmp24_) {
-#line 2700 "PublishingUI.c"
-							SpitPublishingService** _tmp29_ = NULL;
-							gint _tmp29__length1 = 0;
-							SpitPublishingService* _tmp30_ = NULL;
-							SpitPublishingService* _tmp31_ = NULL;
+#line 2669 "PublishingUI.c"
+							SpitPublishingService** _tmp29_;
+							gint _tmp29__length1;
+							SpitPublishingService* _tmp30_;
+							SpitPublishingService* _tmp31_;
 #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp29_ = filtered_services;
 #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2714,13 +2683,13 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
 							_tmp31_ = _g_object_ref0 (_tmp30_);
 #line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_vala_array_add59 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp31_);
-#line 2715 "PublishingUI.c"
+#line 2684 "PublishingUI.c"
 						}
 					}
 				}
 #line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (service);
-#line 2721 "PublishingUI.c"
+#line 2690 "PublishingUI.c"
 			}
 		}
 	}
@@ -2732,7 +2701,7 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
 	if (result_length1) {
 #line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*result_length1 = _tmp32__length1;
-#line 2733 "PublishingUI.c"
+#line 2702 "PublishingUI.c"
 	}
 #line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _tmp32_;
@@ -2740,37 +2709,37 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
 	all_services = (_vala_array_free (all_services, all_services_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2741 "PublishingUI.c"
+#line 2710 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
-	PublishingUIPublishingDialog* _tmp0_ = NULL;
-	GTimer* _tmp1_ = NULL;
+	PublishingUIPublishingDialog* _tmp0_;
+	GTimer* _tmp1_;
 	GeeArrayList* photos = NULL;
-	GeeArrayList* _tmp10_ = NULL;
+	GeeArrayList* _tmp10_;
 	GeeArrayList* videos = NULL;
-	GeeArrayList* _tmp11_ = NULL;
-	GeeCollection* _tmp12_ = NULL;
-	GeeArrayList* _tmp13_ = NULL;
-	GeeArrayList* _tmp14_ = NULL;
+	GeeArrayList* _tmp11_;
+	GeeCollection* _tmp12_;
+	GeeArrayList* _tmp13_;
+	GeeArrayList* _tmp14_;
 	SpitPublishingService** avail_services = NULL;
-	GeeArrayList* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	GeeArrayList* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	SpitPublishingService** _tmp22_ = NULL;
-	gint avail_services_length1 = 0;
-	gint _avail_services_size_ = 0;
-	SpitPublishingService** _tmp23_ = NULL;
-	gint _tmp23__length1 = 0;
-	GeeCollection* _tmp28_ = NULL;
-	PublishingUIPublishingDialog* _tmp29_ = NULL;
-	PublishingUIPublishingDialog* _tmp30_ = NULL;
-	GTimer* _tmp31_ = NULL;
+	GeeArrayList* _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	GeeArrayList* _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
+	SpitPublishingService** _tmp22_;
+	gint avail_services_length1;
+	gint _avail_services_size_;
+	SpitPublishingService** _tmp23_;
+	gint _tmp23__length1;
+	GeeCollection* _tmp26_;
+	PublishingUIPublishingDialog* _tmp27_;
+	PublishingUIPublishingDialog* _tmp28_;
+	GTimer* _tmp29_;
 #line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (to_publish));
 #line 386 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2779,16 +2748,16 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
 	if (_tmp0_ != NULL) {
 #line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		return;
-#line 2780 "PublishingUI.c"
+#line 2749 "PublishingUI.c"
 	}
 #line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = publishing_ui_publishing_dialog_since_last_start;
 #line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp1_ == NULL) {
-#line 2786 "PublishingUI.c"
-		GTimer* _tmp2_ = NULL;
-		GTimer* _tmp3_ = NULL;
-		GTimer* _tmp4_ = NULL;
+#line 2755 "PublishingUI.c"
+		GTimer* _tmp2_;
+		GTimer* _tmp3_;
+		GTimer* _tmp4_;
 #line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp2_ = g_timer_new ();
 #line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2805,13 +2774,13 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
 		g_timer_reset (_tmp4_);
 #line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_elapsed_is_valid = FALSE;
-#line 2806 "PublishingUI.c"
+#line 2775 "PublishingUI.c"
 	} else {
 		gdouble elapsed = 0.0;
-		GTimer* _tmp5_ = NULL;
-		gdouble _tmp6_ = 0.0;
+		GTimer* _tmp5_;
+		gdouble _tmp6_;
 		gboolean _tmp7_ = FALSE;
-		gdouble _tmp8_ = 0.0;
+		gdouble _tmp8_;
 #line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp5_ = publishing_ui_publishing_dialog_since_last_start;
 #line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2822,23 +2791,23 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
 		_tmp8_ = elapsed;
 #line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (_tmp8_ < 0.05) {
-#line 2823 "PublishingUI.c"
-			gboolean _tmp9_ = FALSE;
+#line 2792 "PublishingUI.c"
+			gboolean _tmp9_;
 #line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp9_ = publishing_ui_publishing_dialog_elapsed_is_valid;
 #line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = _tmp9_;
-#line 2829 "PublishingUI.c"
+#line 2798 "PublishingUI.c"
 		} else {
 #line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = FALSE;
-#line 2833 "PublishingUI.c"
+#line 2802 "PublishingUI.c"
 		}
 #line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (_tmp7_) {
 #line 399 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			return;
-#line 2839 "PublishingUI.c"
+#line 2808 "PublishingUI.c"
 		}
 	}
 #line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2883,26 +2852,20 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
 	_tmp23__length1 = avail_services_length1;
 #line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp23__length1 == 0) {
-#line 2884 "PublishingUI.c"
-		const gchar* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
-#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp24_ = _ ("Unable to publish");
+#line 2853 "PublishingUI.c"
+		gchar* _tmp24_;
+		gchar* _tmp25_;
 #line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp25_ = _ ("Shotwell cannot publish the selected items because you do not have a c" \
+		_tmp24_ = g_strdup_printf (_ ("Shotwell cannot publish the selected items because you do not have a c" \
 "ompatible publishing plugin enabled. To correct this, choose <b>Edit %" \
 "s Preferences</b> and enable one or more of the publishing plugins on " \
-"the <b>Plugins</b> tab.");
+"the <b>Plugins</b> tab."), "▸");
 #line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp26_ = g_strdup_printf (_tmp25_, "▸");
+		_tmp25_ = _tmp24_;
 #line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp27_ = _tmp26_;
+		app_window_error_message_with_title (_ ("Unable to publish"), _tmp25_, NULL, FALSE);
 #line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		app_window_error_message_with_title (_tmp24_, _tmp27_, NULL, FALSE);
-#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_g_free0 (_tmp27_);
+		_g_free0 (_tmp25_);
 #line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		avail_services = (_vala_array_free (avail_services, avail_services_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2911,32 +2874,32 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
 		_g_object_unref0 (photos);
 #line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		return;
-#line 2909 "PublishingUI.c"
+#line 2872 "PublishingUI.c"
 	}
 #line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_debug ("PublishingUI.vala:422: PublishingDialog.go( )");
 #line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp28_ = to_publish;
+	_tmp26_ = to_publish;
 #line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp29_ = publishing_ui_publishing_dialog_new (_tmp28_);
+	_tmp27_ = publishing_ui_publishing_dialog_new (_tmp26_);
 #line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_object_ref_sink (_tmp29_);
+	g_object_ref_sink (_tmp27_);
 #line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (publishing_ui_publishing_dialog_active_instance);
 #line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	publishing_ui_publishing_dialog_active_instance = _tmp29_;
+	publishing_ui_publishing_dialog_active_instance = _tmp27_;
 #line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp30_ = publishing_ui_publishing_dialog_active_instance;
+	_tmp28_ = publishing_ui_publishing_dialog_active_instance;
 #line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	publishing_ui_publishing_dialog_run (_tmp30_);
+	publishing_ui_publishing_dialog_run (_tmp28_);
 #line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (publishing_ui_publishing_dialog_active_instance);
 #line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_active_instance = NULL;
 #line 431 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp31_ = publishing_ui_publishing_dialog_since_last_start;
+	_tmp29_ = publishing_ui_publishing_dialog_since_last_start;
 #line 431 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_timer_start (_tmp31_);
+	g_timer_start (_tmp29_);
 #line 432 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_elapsed_is_valid = TRUE;
 #line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2945,13 +2908,13 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
 	_g_object_unref0 (videos);
 #line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (photos);
-#line 2943 "PublishingUI.c"
+#line 2906 "PublishingUI.c"
 }
 
 
 static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self, GdkEventAny* evt) {
 	gboolean result = FALSE;
-	SpitPublishingConcretePublishingHost* _tmp0_ = NULL;
+	SpitPublishingConcretePublishingHost* _tmp0_;
 #line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), FALSE);
 #line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2972,42 +2935,42 @@ static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPub
 	result = TRUE;
 #line 441 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2970 "PublishingUI.c"
+#line 2933 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPublishingDialog* self) {
 	GtkTreeIter iter = {0};
 	gboolean have_active_iter = FALSE;
-	GtkComboBox* _tmp0_ = NULL;
+	GtkComboBox* _tmp0_;
 	GtkTreeIter _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 	GValue service_name_val = {0};
-	GtkListStore* _tmp7_ = NULL;
-	GtkTreeIter _tmp8_ = {0};
+	GtkListStore* _tmp7_;
+	GtkTreeIter _tmp8_;
 	GValue _tmp9_ = {0};
 	gchar* service_name = NULL;
-	GValue _tmp10_ = {0};
-	gchar* _tmp11_ = NULL;
+	GValue _tmp10_;
+	gchar* _tmp11_;
 	SpitPublishingService* selected_service = NULL;
 	SpitPublishingService** services = NULL;
-	gint _tmp12_ = 0;
-	SpitPublishingService** _tmp13_ = NULL;
-	gint services_length1 = 0;
-	gint _services_size_ = 0;
-	SpitPublishingService** _tmp14_ = NULL;
-	gint _tmp14__length1 = 0;
-	SpitPublishingService* _tmp21_ = NULL;
-	ConfigFacade* _tmp22_ = NULL;
-	ConfigFacade* _tmp23_ = NULL;
-	SpitPublishingService* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	SpitPublishingService* _tmp26_ = NULL;
-	SpitPublishingPublishable** _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
-	SpitPublishingConcretePublishingHost* _tmp28_ = NULL;
-	SpitPublishingConcretePublishingHost* _tmp29_ = NULL;
+	gint _tmp12_;
+	SpitPublishingService** _tmp13_;
+	gint services_length1;
+	gint _services_size_;
+	SpitPublishingService** _tmp14_;
+	gint _tmp14__length1;
+	SpitPublishingService* _tmp21_;
+	ConfigFacade* _tmp22_;
+	ConfigFacade* _tmp23_;
+	SpitPublishingService* _tmp24_;
+	const gchar* _tmp25_;
+	SpitPublishingService* _tmp26_;
+	SpitPublishingPublishable** _tmp27_;
+	gint _tmp27__length1;
+	SpitPublishingConcretePublishingHost* _tmp28_;
+	SpitPublishingConcretePublishingHost* _tmp29_;
 #line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3024,9 +2987,9 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
 	_tmp3_ = have_active_iter;
 #line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (!_tmp3_) {
-#line 3022 "PublishingUI.c"
-		GtkComboBox* _tmp4_ = NULL;
-		GtkComboBox* _tmp5_ = NULL;
+#line 2985 "PublishingUI.c"
+		GtkComboBox* _tmp4_;
+		GtkComboBox* _tmp5_;
 		GtkTreeIter _tmp6_ = {0};
 #line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = self->priv->service_selector_box;
@@ -3038,7 +3001,7 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
 		gtk_combo_box_get_active_iter (_tmp5_, &_tmp6_);
 #line 455 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		iter = _tmp6_;
-#line 3036 "PublishingUI.c"
+#line 2999 "PublishingUI.c"
 	}
 #line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp7_ = self->priv->service_selector_box_model;
@@ -3070,7 +3033,7 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
 	_tmp14_ = services;
 #line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp14__length1 = services_length1;
-#line 3068 "PublishingUI.c"
+#line 3031 "PublishingUI.c"
 	{
 		SpitPublishingService** service_collection = NULL;
 		gint service_collection_length1 = 0;
@@ -3082,18 +3045,18 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
 		service_collection_length1 = _tmp14__length1;
 #line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		for (service_it = 0; service_it < _tmp14__length1; service_it = service_it + 1) {
-#line 3080 "PublishingUI.c"
-			SpitPublishingService* _tmp15_ = NULL;
+#line 3043 "PublishingUI.c"
+			SpitPublishingService* _tmp15_;
 			SpitPublishingService* service = NULL;
 #line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp15_ = _g_object_ref0 (service_collection[service_it]);
 #line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			service = _tmp15_;
-#line 3087 "PublishingUI.c"
+#line 3050 "PublishingUI.c"
 			{
-				SpitPublishingService* _tmp16_ = NULL;
-				const gchar* _tmp17_ = NULL;
-				const gchar* _tmp18_ = NULL;
+				SpitPublishingService* _tmp16_;
+				const gchar* _tmp17_;
+				const gchar* _tmp18_;
 #line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp16_ = service;
 #line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3102,9 +3065,9 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
 				_tmp18_ = service_name;
 #line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
-#line 3100 "PublishingUI.c"
-					SpitPublishingService* _tmp19_ = NULL;
-					SpitPublishingService* _tmp20_ = NULL;
+#line 3063 "PublishingUI.c"
+					SpitPublishingService* _tmp19_;
+					SpitPublishingService* _tmp20_;
 #line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp19_ = service;
 #line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3117,11 +3080,11 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
 					_g_object_unref0 (service);
 #line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					break;
-#line 3115 "PublishingUI.c"
+#line 3078 "PublishingUI.c"
 				}
 #line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (service);
-#line 3119 "PublishingUI.c"
+#line 3082 "PublishingUI.c"
 			}
 		}
 	}
@@ -3165,12 +3128,12 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
 	_g_free0 (service_name);
 #line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL;
-#line 3163 "PublishingUI.c"
+#line 3126 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_on_close_cancel_clicked (PublishingUIPublishingDialog* self) {
-	SpitPublishingConcretePublishingHost* _tmp0_ = NULL;
+	SpitPublishingConcretePublishingHost* _tmp0_;
 #line 479 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 480 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3188,12 +3151,12 @@ static void publishing_ui_publishing_dialog_on_close_cancel_clicked (PublishingU
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 485 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 3185 "PublishingUI.c"
+#line 3148 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_large_window_mode (PublishingUIPublishingDialog* self) {
-	GtkBox* _tmp0_ = NULL;
+	GtkBox* _tmp0_;
 #line 488 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 489 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3204,12 +3167,12 @@ static void publishing_ui_publishing_dialog_set_large_window_mode (PublishingUIP
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
 #line 492 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3201 "PublishingUI.c"
+#line 3164 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_colossal_window_mode (PublishingUIPublishingDialog* self) {
-	GtkBox* _tmp0_ = NULL;
+	GtkBox* _tmp0_;
 #line 495 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 496 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3220,12 +3183,12 @@ static void publishing_ui_publishing_dialog_set_colossal_window_mode (Publishing
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
 #line 499 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3217 "PublishingUI.c"
+#line 3180 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_standard_window_mode (PublishingUIPublishingDialog* self) {
-	GtkBox* _tmp0_ = NULL;
+	GtkBox* _tmp0_;
 #line 502 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 503 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3236,7 +3199,7 @@ static void publishing_ui_publishing_dialog_set_standard_window_mode (Publishing
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
 #line 506 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3233 "PublishingUI.c"
+#line 3196 "PublishingUI.c"
 }
 
 
@@ -3245,7 +3208,7 @@ static void publishing_ui_publishing_dialog_set_free_sizable_window_mode (Publis
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 510 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 3242 "PublishingUI.c"
+#line 3205 "PublishingUI.c"
 }
 
 
@@ -3254,14 +3217,14 @@ static void publishing_ui_publishing_dialog_clear_free_sizable_window_mode (Publ
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 514 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3251 "PublishingUI.c"
+#line 3214 "PublishingUI.c"
 }
 
 
 SpitPublishingDialogPane* publishing_ui_publishing_dialog_get_active_pane (PublishingUIPublishingDialog* self) {
 	SpitPublishingDialogPane* result = NULL;
-	SpitPublishingDialogPane* _tmp0_ = NULL;
-	SpitPublishingDialogPane* _tmp1_ = NULL;
+	SpitPublishingDialogPane* _tmp0_;
+	SpitPublishingDialogPane* _tmp1_;
 #line 517 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), NULL);
 #line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3272,83 +3235,77 @@ SpitPublishingDialogPane* publishing_ui_publishing_dialog_get_active_pane (Publi
 	result = _tmp1_;
 #line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 3269 "PublishingUI.c"
+#line 3232 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_set_close_button_mode (PublishingUIPublishingDialog* self) {
-	GtkButton* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkButton* _tmp2_ = NULL;
+	GtkButton* _tmp0_;
+	GtkButton* _tmp1_;
 #line 521 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 522 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->close_cancel_button;
 #line 522 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp1_ = _ ("_Close");
-#line 522 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_button_set_label (_tmp0_, _tmp1_);
+	gtk_button_set_label (_tmp0_, _ ("_Close"));
 #line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp2_ = self->priv->close_cancel_button;
+	_tmp1_ = self->priv->close_cancel_button;
 #line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 3289 "PublishingUI.c"
+	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
+#line 3249 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublishingDialog* self) {
-	GtkButton* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	GtkButton* _tmp0_;
 #line 526 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->close_cancel_button;
 #line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp1_ = _ ("_Cancel");
-#line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_button_set_label (_tmp0_, _tmp1_);
-#line 3304 "PublishingUI.c"
+	gtk_button_set_label (_tmp0_, _ ("_Cancel"));
+#line 3261 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self) {
-	GtkComboBox* _tmp0_ = NULL;
+	GtkComboBox* _tmp0_;
 #line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 531 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
 #line 531 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 3316 "PublishingUI.c"
+#line 3273 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self) {
-	GtkComboBox* _tmp0_ = NULL;
+	GtkComboBox* _tmp0_;
 #line 534 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 535 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
 #line 535 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3328 "PublishingUI.c"
+#line 3285 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog* self, SpitPublishingDialogPane* pane) {
-	SpitPublishingDialogPane* _tmp0_ = NULL;
-	GtkBox* _tmp6_ = NULL;
-	SpitPublishingDialogPane* _tmp7_ = NULL;
-	GtkWidget* _tmp8_ = NULL;
-	GtkWidget* _tmp9_ = NULL;
+	SpitPublishingDialogPane* _tmp0_;
+	GtkBox* _tmp6_;
+	SpitPublishingDialogPane* _tmp7_;
+	GtkWidget* _tmp8_;
+	GtkWidget* _tmp9_;
 	SpitPublishingDialogPaneGeometryOptions geometry_options = 0;
-	SpitPublishingDialogPane* _tmp10_ = NULL;
-	SpitPublishingDialogPaneGeometryOptions _tmp11_ = 0;
-	SpitPublishingDialogPaneGeometryOptions _tmp12_ = 0;
-	SpitPublishingDialogPaneGeometryOptions _tmp14_ = 0;
-	SpitPublishingDialogPane* _tmp15_ = NULL;
-	SpitPublishingDialogPane* _tmp16_ = NULL;
-	SpitPublishingDialogPane* _tmp17_ = NULL;
+	SpitPublishingDialogPane* _tmp10_;
+	SpitPublishingDialogPaneGeometryOptions _tmp11_;
+	SpitPublishingDialogPaneGeometryOptions _tmp12_;
+	SpitPublishingDialogPaneGeometryOptions _tmp14_;
+	SpitPublishingDialogPane* _tmp15_;
+	SpitPublishingDialogPane* _tmp16_;
+	SpitPublishingDialogPane* _tmp17_;
 #line 538 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
 #line 538 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3359,12 +3316,12 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog*
 	_tmp0_ = self->priv->active_pane;
 #line 541 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp0_ != NULL) {
-#line 3356 "PublishingUI.c"
-		SpitPublishingDialogPane* _tmp1_ = NULL;
-		GtkBox* _tmp2_ = NULL;
-		SpitPublishingDialogPane* _tmp3_ = NULL;
-		GtkWidget* _tmp4_ = NULL;
-		GtkWidget* _tmp5_ = NULL;
+#line 3313 "PublishingUI.c"
+		SpitPublishingDialogPane* _tmp1_;
+		GtkBox* _tmp2_;
+		SpitPublishingDialogPane* _tmp3_;
+		GtkWidget* _tmp4_;
+		GtkWidget* _tmp5_;
 #line 542 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_debug ("PublishingUI.vala:542: PublishingDialog: install_pane( ): a pane is al" \
 "ready installed; removing it.");
@@ -3384,7 +3341,7 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog*
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), _tmp5_);
 #line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (_tmp5_);
-#line 3380 "PublishingUI.c"
+#line 3337 "PublishingUI.c"
 	}
 #line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp6_ = self->priv->central_area_layouter;
@@ -3412,20 +3369,20 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog*
 	if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) {
 #line 554 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_set_large_window_mode (self);
-#line 3408 "PublishingUI.c"
+#line 3365 "PublishingUI.c"
 	} else {
-		SpitPublishingDialogPaneGeometryOptions _tmp13_ = 0;
+		SpitPublishingDialogPaneGeometryOptions _tmp13_;
 #line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp13_ = geometry_options;
 #line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if ((_tmp13_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) {
 #line 556 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			publishing_ui_publishing_dialog_set_colossal_window_mode (self);
-#line 3417 "PublishingUI.c"
+#line 3374 "PublishingUI.c"
 		} else {
 #line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			publishing_ui_publishing_dialog_set_standard_window_mode (self);
-#line 3421 "PublishingUI.c"
+#line 3378 "PublishingUI.c"
 		}
 	}
 #line 560 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3434,11 +3391,11 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog*
 	if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) {
 #line 561 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_set_free_sizable_window_mode (self);
-#line 3430 "PublishingUI.c"
+#line 3387 "PublishingUI.c"
 	} else {
 #line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_clear_free_sizable_window_mode (self);
-#line 3434 "PublishingUI.c"
+#line 3391 "PublishingUI.c"
 	}
 #line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp15_ = pane;
@@ -3452,14 +3409,14 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog*
 	_tmp17_ = pane;
 #line 566 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	spit_publishing_dialog_pane_on_pane_installed (_tmp17_);
-#line 3448 "PublishingUI.c"
+#line 3405 "PublishingUI.c"
 }
 
 
 gint publishing_ui_publishing_dialog_run (PublishingUIPublishingDialog* self) {
 	gint result = 0;
 	gint _result_ = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 569 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), 0);
 #line 570 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -3476,7 +3433,7 @@ gint publishing_ui_publishing_dialog_run (PublishingUIPublishingDialog* self) {
 	result = _result_;
 #line 576 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 3472 "PublishingUI.c"
+#line 3429 "PublishingUI.c"
 }
 
 
@@ -3487,18 +3444,18 @@ static void publishing_ui_publishing_dialog_class_init (PublishingUIPublishingDi
 	g_type_class_add_private (klass, sizeof (PublishingUIPublishingDialogPrivate));
 #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_ui_publishing_dialog_finalize;
-#line 3483 "PublishingUI.c"
+#line 3440 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_instance_init (PublishingUIPublishingDialog * self) {
 #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv = PUBLISHING_UI_PUBLISHING_DIALOG_GET_PRIVATE (self);
-#line 3490 "PublishingUI.c"
+#line 3447 "PublishingUI.c"
 }
 
 
-static void publishing_ui_publishing_dialog_finalize (GObject* obj) {
+static void publishing_ui_publishing_dialog_finalize (GObject * obj) {
 	PublishingUIPublishingDialog * self;
 #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, PublishingUIPublishingDialog);
@@ -3520,7 +3477,7 @@ static void publishing_ui_publishing_dialog_finalize (GObject* obj) {
 	spit_pluggable_info_destroy (&self->priv->info);
 #line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (publishing_ui_publishing_dialog_parent_class)->finalize (obj);
-#line 3516 "PublishingUI.c"
+#line 3473 "PublishingUI.c"
 }