Update upstream source from tag 'upstream/0.28.2'

Update to upstream version '0.28.2' with Debian dir 811236a8e9a1308bf427065dcb6270419ff4f965
author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2018-05-01 14:35:32 +0200
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2018-05-01 14:35:32 +0200
commit: e230b6f78546827521107be23797048482c8b193 (patch)
tree: 948c1e77382c484819ea399bba4edcdc19cc6bf0 /src/publishing
parent: 211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff)
parent: 49120f48474fc8fdc2448c75d961bc238213cfac (diff)
5 files changed, 956 insertions, 959 deletions
diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c
index 04da15d..08c99ff 100644
--- a/src/publishing/APIGlue.c
+++ b/src/publishing/APIGlue.c
@@ -331,8 +331,8 @@ 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 gchar** _vala_array_dup22 (gchar** self, int length);
+static void _vala_array_add63 (gchar** * array, int* length, int* size, gchar* value);
+static gchar** _vala_array_dup20 (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);
@@ -416,11 +416,11 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 #line 27 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 419 "APIGlue.c"
-			goto __catch39_g_error;
+			goto __catch43_g_error;
 		}
 	}
-	goto __finally39;
-	__catch39_g_error:
+	goto __finally43;
+	__catch43_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp5_;
@@ -444,7 +444,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 		_g_error_free0 (err);
 #line 446 "APIGlue.c"
 	}
-	__finally39:
+	__finally43:
 #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 26 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -692,11 +692,11 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 #line 60 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 694 "APIGlue.c"
-				goto __catch40_g_error;
+				goto __catch44_g_error;
 			}
 		}
-		goto __finally40;
-		__catch40_g_error:
+		goto __finally44;
+		__catch44_g_error:
 		{
 			GError* err = NULL;
 			LibraryPhoto* _tmp25_;
@@ -725,9 +725,9 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			_g_error_free0 (err);
 #line 727 "APIGlue.c"
-			goto __finally40;
+			goto __finally44;
 		}
-		__finally40:
+		__finally44:
 #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 57 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -882,11 +882,11 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 #line 80 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 883 "APIGlue.c"
-					goto __catch41_g_error;
+					goto __catch45_g_error;
 				}
 			}
-			goto __finally41;
-			__catch41_g_error:
+			goto __finally45;
+			__catch45_g_error:
 			{
 				GError* err = NULL;
 				Video* _tmp56_;
@@ -915,9 +915,9 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				_g_error_free0 (err);
 #line 916 "APIGlue.c"
-				goto __finally41;
+				goto __finally45;
 			}
-			__finally41:
+			__finally45:
 #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 79 "/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_add63 (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"
@@ -1082,7 +1082,7 @@ static void _vala_array_add60 (gchar** * array, int* length, int* size, gchar* v
 }
 
 
-static gchar** _vala_array_dup22 (gchar** self, int length) {
+static gchar** _vala_array_dup20 (gchar** self, int length) {
 	gchar** result;
 	int i;
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
@@ -1194,7 +1194,7 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				_tmp13_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
 #line 108 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-				_vala_array_add60 (&_result_, &_result__length1, &__result__size_, _tmp13_);
+				_vala_array_add63 (&_result_, &_result__length1, &__result__size_, _tmp13_);
 #line 107 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				_g_object_unref0 (tag);
 #line 1198 "APIGlue.c"
@@ -1234,7 +1234,7 @@ static gchar** publishing_glue_media_source_publishable_wrapper_real_get_publish
 #line 1232 "APIGlue.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
-	_tmp17_ = (_tmp14_ != NULL) ? _vala_array_dup22 (_tmp14_, _tmp14__length1) : ((gpointer) _tmp14_);
+	_tmp17_ = (_tmp14_ != NULL) ? _vala_array_dup20 (_tmp14_, _tmp14__length1) : ((gpointer) _tmp14_);
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 	_tmp17__length1 = _tmp14__length1;
 #line 112 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
diff --git a/src/publishing/Publishing.c b/src/publishing/Publishing.c
index 5ae726a..a502118 100644
--- a/src/publishing/Publishing.c
+++ b/src/publishing/Publishing.c
@@ -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_add55 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add56 (gchar** * array, int* length, int* size, gchar* value);
+static void _vala_array_add57 (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_add54 (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* v
 }
 
 
-static void _vala_array_add52 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add55 (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* v
 }
 
 
-static void _vala_array_add53 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add56 (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* v
 }
 
 
-static void _vala_array_add54 (gchar** * array, int* length, int* size, gchar* value) {
+static void _vala_array_add57 (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"
@@ -131,7 +131,7 @@ void publishing_init (GError** error) {
 #line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp2_ = g_strdup ("org.yorba.shotwell.publishing.facebook");
 #line 11 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
-	_vala_array_add51 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
+	_vala_array_add54 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
 #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp3_ = core_ids;
 #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -139,7 +139,7 @@ void publishing_init (GError** error) {
 #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp4_ = g_strdup ("org.yorba.shotwell.publishing.picasa");
 #line 12 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
-	_vala_array_add52 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp4_);
+	_vala_array_add55 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp4_);
 #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp5_ = core_ids;
 #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -147,7 +147,7 @@ void publishing_init (GError** error) {
 #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp6_ = g_strdup ("org.yorba.shotwell.publishing.flickr");
 #line 13 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
-	_vala_array_add53 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp6_);
+	_vala_array_add56 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp6_);
 #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp7_ = core_ids;
 #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
@@ -155,7 +155,7 @@ void publishing_init (GError** error) {
 #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp8_ = g_strdup ("org.yorba.shotwell.publishing.youtube");
 #line 14 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
-	_vala_array_add54 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp8_);
+	_vala_array_add57 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp8_);
 #line 16 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
 	_tmp9_ = core_ids;
 #line 16 "/home/jens/Source/shotwell/src/publishing/Publishing.vala"
diff --git a/src/publishing/PublishingPluginHost.c b/src/publishing/PublishingPluginHost.c
index 54f1495..aee15c9 100644
--- a/src/publishing/PublishingPluginHost.c
+++ b/src/publishing/PublishingPluginHost.c
@@ -183,7 +183,7 @@ SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_n
 SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_construct (GType object_type, SpitPublishingService* service, PublishingUIPublishingDialog* dialog, SpitPublishingPublishable** publishables, int publishables_length1);
 PluginsStandardHostInterface* plugins_standard_host_interface_new (SpitPluggable* pluggable, const gchar* config_domain);
 PluginsStandardHostInterface* plugins_standard_host_interface_construct (GType object_type, SpitPluggable* pluggable, const gchar* config_domain);
-static SpitPublishingPublishable** _vala_array_dup20 (SpitPublishingPublishable** self, int length);
+static SpitPublishingPublishable** _vala_array_dup18 (SpitPublishingPublishable** self, int length);
 static void spit_publishing_concrete_publishing_host_on_login_clicked (SpitPublishingConcretePublishingHost* self);
 static void spit_publishing_concrete_publishing_host_clean_up (SpitPublishingConcretePublishingHost* self);
 GType publishing_glue_media_source_publishable_wrapper_get_type (void) G_GNUC_CONST;
@@ -233,7 +233,7 @@ void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublish
 static void spit_publishing_concrete_publishing_host_real_set_dialog_default_widget (SpitPublishingPluginHost* base, GtkWidget* widget);
 static SpitPublishingPublisherMediaType spit_publishing_concrete_publishing_host_real_get_publishable_media_type (SpitPublishingPluginHost* base);
 static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real_get_publishables (SpitPublishingPluginHost* base, int* result_length1);
-static SpitPublishingPublishable** _vala_array_dup21 (SpitPublishingPublishable** self, int length);
+static SpitPublishingPublishable** _vala_array_dup19 (SpitPublishingPublishable** self, int length);
 static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_real_serialize_publishables (SpitPublishingPluginHost* base, gint content_major_axis, gboolean strip_metadata, void** result_target, GDestroyNotify* result_target_destroy_notify);
 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);
@@ -250,7 +250,7 @@ static gpointer _g_object_ref0 (gpointer self) {
 }
 
 
-static SpitPublishingPublishable** _vala_array_dup20 (SpitPublishingPublishable** self, int length) {
+static SpitPublishingPublishable** _vala_array_dup18 (SpitPublishingPublishable** self, int length) {
 	SpitPublishingPublishable** result;
 	int i;
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -300,7 +300,7 @@ SpitPublishingConcretePublishingHost* spit_publishing_concrete_publishing_host_c
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_tmp2__length1 = publishables_length1;
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp3_ = (_tmp2_ != NULL) ? _vala_array_dup20 (_tmp2_, _tmp2__length1) : ((gpointer) _tmp2_);
+	_tmp3_ = (_tmp2_ != NULL) ? _vala_array_dup18 (_tmp2_, _tmp2__length1) : ((gpointer) _tmp2_);
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_tmp3__length1 = _tmp2__length1;
 #line 28 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1060,7 +1060,7 @@ static SpitPublishingPublisherMediaType spit_publishing_concrete_publishing_host
 }
 
 
-static SpitPublishingPublishable** _vala_array_dup21 (SpitPublishingPublishable** self, int length) {
+static SpitPublishingPublishable** _vala_array_dup19 (SpitPublishingPublishable** self, int length) {
 	SpitPublishingPublishable** result;
 	int i;
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1097,7 +1097,7 @@ static SpitPublishingPublishable** spit_publishing_concrete_publishing_host_real
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_tmp0__length1 = self->priv->publishables_length1;
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup21 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup19 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 193 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -1267,7 +1267,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 1266 "PublishingPluginHost.c"
-							goto __catch38_spit_publishing_publishing_error;
+							goto __catch42_spit_publishing_publishing_error;
 						}
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 						_g_object_unref0 (wrapper);
@@ -1287,8 +1287,8 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					_g_object_unref0 (wrapper);
 #line 1285 "PublishingPluginHost.c"
 				}
-				goto __finally38;
-				__catch38_spit_publishing_publishing_error:
+				goto __finally42;
+				__catch42_spit_publishing_publishing_error:
 				{
 					GError* err = NULL;
 					GError* _tmp16_;
@@ -1325,7 +1325,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					return result;
 #line 1323 "PublishingPluginHost.c"
 				}
-				__finally38:
+				__finally42:
 #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 212 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
diff --git a/src/publishing/PublishingUI.c b/src/publishing/PublishingUI.c
index a0fe079..86bf534 100644
--- a/src/publishing/PublishingUI.c
+++ b/src/publishing/PublishingUI.c
@@ -480,6 +480,7 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 PublishingUIPublishingDialog* publishing_ui_publishing_dialog_new (GeeCollection* to_publish);
 PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType object_type, GeeCollection* to_publish);
+gint resources_use_header_bar (void);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
@@ -488,7 +489,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_add58 (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);
@@ -505,13 +506,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 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 gint __lambda16_ (void* a, void* b);
+gint utf8_cs_compare (void* a, void* b);
+static gint ___lambda16____compar_fn_t (void* key1, void* key2);
+static void _vala_array_add60 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
+static void _vala_array_add61 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value);
+static void _vala_array_add62 (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;
@@ -553,21 +554,21 @@ PublishingUIConcreteDialogPane* publishing_ui_concrete_dialog_pane_construct (GT
 	self->builder = _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 557 "PublishingUI.c"
+#line 558 "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 564 "PublishingUI.c"
+#line 565 "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 571 "PublishingUI.c"
+#line 572 "PublishingUI.c"
 }
 
 
@@ -586,7 +587,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 590 "PublishingUI.c"
+#line 591 "PublishingUI.c"
 }
 
 
@@ -599,7 +600,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 603 "PublishingUI.c"
+#line 604 "PublishingUI.c"
 }
 
 
@@ -607,7 +608,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 611 "PublishingUI.c"
+#line 612 "PublishingUI.c"
 }
 
 
@@ -615,7 +616,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 619 "PublishingUI.c"
+#line 620 "PublishingUI.c"
 }
 
 
@@ -624,7 +625,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 628 "PublishingUI.c"
+#line 629 "PublishingUI.c"
 }
 
 
@@ -639,7 +640,7 @@ static void publishing_ui_concrete_dialog_pane_spit_publishing_dialog_pane_inter
 	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 643 "PublishingUI.c"
+#line 644 "PublishingUI.c"
 }
 
 
@@ -648,7 +649,7 @@ 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 652 "PublishingUI.c"
+#line 653 "PublishingUI.c"
 }
 
 
@@ -662,7 +663,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 666 "PublishingUI.c"
+#line 667 "PublishingUI.c"
 }
 
 
@@ -717,7 +718,7 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp
 	_tmp6_ = enable_markup;
 #line 40 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp6_) {
-#line 721 "PublishingUI.c"
+#line 722 "PublishingUI.c"
 		GtkLabel* _tmp7_;
 		const gchar* _tmp8_;
 		GtkLabel* _tmp9_;
@@ -736,7 +737,7 @@ 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 740 "PublishingUI.c"
+#line 741 "PublishingUI.c"
 	} else {
 		GtkLabel* _tmp11_;
 		const gchar* _tmp12_;
@@ -746,18 +747,18 @@ PublishingUIStaticMessagePane* publishing_ui_static_message_pane_construct (GTyp
 		_tmp12_ = message_string;
 #line 45 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_label_set_label (_tmp11_, _tmp12_);
-#line 750 "PublishingUI.c"
+#line 751 "PublishingUI.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 754 "PublishingUI.c"
+#line 755 "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 761 "PublishingUI.c"
+#line 762 "PublishingUI.c"
 }
 
 
@@ -768,7 +769,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 772 "PublishingUI.c"
+#line 773 "PublishingUI.c"
 }
 
 
@@ -777,7 +778,7 @@ 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 781 "PublishingUI.c"
+#line 782 "PublishingUI.c"
 }
 
 
@@ -789,7 +790,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 793 "PublishingUI.c"
+#line 794 "PublishingUI.c"
 }
 
 
@@ -808,7 +809,7 @@ 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 812 "PublishingUI.c"
+#line 813 "PublishingUI.c"
 }
 
 
@@ -877,14 +878,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 881 "PublishingUI.c"
+#line 882 "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 888 "PublishingUI.c"
+#line 889 "PublishingUI.c"
 }
 
 
@@ -893,7 +894,7 @@ static void publishing_ui_login_welcome_pane_on_login_clicked (PublishingUILogin
 	g_return_if_fail (PUBLISHING_UI_IS_LOGIN_WELCOME_PANE (self));
 #line 68 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_signal_emit (self, publishing_ui_login_welcome_pane_signals[PUBLISHING_UI_LOGIN_WELCOME_PANE_LOGIN_REQUESTED_SIGNAL], 0);
-#line 897 "PublishingUI.c"
+#line 898 "PublishingUI.c"
 }
 
 
@@ -906,7 +907,7 @@ static void publishing_ui_login_welcome_pane_class_init (PublishingUILoginWelcom
 	G_OBJECT_CLASS (klass)->finalize = publishing_ui_login_welcome_pane_finalize;
 #line 50 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	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"
+#line 911 "PublishingUI.c"
 }
 
 
@@ -917,7 +918,7 @@ 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 921 "PublishingUI.c"
+#line 922 "PublishingUI.c"
 }
 
 
@@ -931,7 +932,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 935 "PublishingUI.c"
+#line 936 "PublishingUI.c"
 }
 
 
@@ -979,14 +980,14 @@ 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 983 "PublishingUI.c"
+#line 984 "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 990 "PublishingUI.c"
+#line 991 "PublishingUI.c"
 }
 
 
@@ -1003,7 +1004,7 @@ 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 1007 "PublishingUI.c"
+#line 1008 "PublishingUI.c"
 }
 
 
@@ -1018,7 +1019,7 @@ 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 1022 "PublishingUI.c"
+#line 1023 "PublishingUI.c"
 }
 
 
@@ -1039,7 +1040,7 @@ 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 1043 "PublishingUI.c"
+#line 1044 "PublishingUI.c"
 		GtkProgressBar* _tmp3_;
 		const gchar* _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1048,13 +1049,13 @@ void publishing_ui_progress_pane_set_status (PublishingUIProgressPane* self, con
 		_tmp4_ = status_text;
 #line 91 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_progress_bar_set_text (_tmp3_, _tmp4_);
-#line 1052 "PublishingUI.c"
+#line 1053 "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 1058 "PublishingUI.c"
+#line 1059 "PublishingUI.c"
 }
 
 
@@ -1065,7 +1066,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 1069 "PublishingUI.c"
+#line 1070 "PublishingUI.c"
 }
 
 
@@ -1074,7 +1075,7 @@ 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 1078 "PublishingUI.c"
+#line 1079 "PublishingUI.c"
 }
 
 
@@ -1086,7 +1087,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 1090 "PublishingUI.c"
+#line 1091 "PublishingUI.c"
 }
 
 
@@ -1113,7 +1114,7 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type
 	_tmp0_ = published_media;
 #line 103 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1117 "PublishingUI.c"
+#line 1118 "PublishingUI.c"
 		gint _tmp1_;
 		gchar* _tmp2_;
 #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1124,14 +1125,14 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type
 		_g_free0 (message_string);
 #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		message_string = _tmp2_;
-#line 1128 "PublishingUI.c"
+#line 1129 "PublishingUI.c"
 	} else {
 		SpitPublishingPublisherMediaType _tmp3_;
 #line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp3_ = published_media;
 #line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (_tmp3_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 1135 "PublishingUI.c"
+#line 1136 "PublishingUI.c"
 			gint _tmp4_;
 			gchar* _tmp5_;
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1142,14 +1143,14 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type
 			_g_free0 (message_string);
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			message_string = _tmp5_;
-#line 1146 "PublishingUI.c"
+#line 1147 "PublishingUI.c"
 		} else {
 			SpitPublishingPublisherMediaType _tmp6_;
 #line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp6_ = published_media;
 #line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			if (_tmp6_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
-#line 1153 "PublishingUI.c"
+#line 1154 "PublishingUI.c"
 				gchar* _tmp7_;
 #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp7_ = g_strdup (_ ("The selected photos/videos were successfully published."));
@@ -1157,11 +1158,11 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type
 				_g_free0 (message_string);
 #line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				message_string = _tmp7_;
-#line 1161 "PublishingUI.c"
+#line 1162 "PublishingUI.c"
 			} else {
 #line 118 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				g_assert_not_reached ();
-#line 1165 "PublishingUI.c"
+#line 1166 "PublishingUI.c"
 			}
 		}
 	}
@@ -1173,21 +1174,21 @@ PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type
 	_g_free0 (message_string);
 #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 1177 "PublishingUI.c"
+#line 1178 "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 1184 "PublishingUI.c"
+#line 1185 "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 1191 "PublishingUI.c"
+#line 1192 "PublishingUI.c"
 }
 
 
@@ -1213,21 +1214,21 @@ PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_construc
 	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 1217 "PublishingUI.c"
+#line 1218 "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 1224 "PublishingUI.c"
+#line 1225 "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 1231 "PublishingUI.c"
+#line 1232 "PublishingUI.c"
 }
 
 
@@ -1253,21 +1254,21 @@ PublishingUILoginWaitPane* publishing_ui_login_wait_pane_construct (GType object
 	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 1257 "PublishingUI.c"
+#line 1258 "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 1264 "PublishingUI.c"
+#line 1265 "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 1271 "PublishingUI.c"
+#line 1272 "PublishingUI.c"
 }
 
 
@@ -1290,40 +1291,40 @@ GType publishing_ui_login_wait_pane_get_type (void) {
 static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = publishing_ui_publishing_dialog_on_window_close ((PublishingUIPublishingDialog*) self, event);
-#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 1296 "PublishingUI.c"
+#line 1297 "PublishingUI.c"
 }
 
 
-static void _vala_array_add55 (SpitPublishingPublishable** * array, int* length, int* size, SpitPublishingPublishable* value) {
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void _vala_array_add58 (SpitPublishingPublishable** * array, int* length, int* size, SpitPublishingPublishable* value) {
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingPublishable*, *array, (*size) + 1);
-#line 1307 "PublishingUI.c"
+#line 1308 "PublishingUI.c"
 	}
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 1313 "PublishingUI.c"
+#line 1314 "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"
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_on_service_changed ((PublishingUIPublishingDialog*) self);
-#line 1320 "PublishingUI.c"
+#line 1321 "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"
+#line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_on_close_cancel_clicked ((PublishingUIPublishingDialog*) self);
-#line 1327 "PublishingUI.c"
+#line 1328 "PublishingUI.c"
 }
 
 
@@ -1333,10 +1334,9 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 	gint _tmp1_;
 	gint _tmp2_;
 	gboolean use_header = FALSE;
-	GtkSettings* _tmp3_;
-	gint _tmp4_ = 0;
+	gint _tmp3_;
+	gint _tmp4_;
 	gboolean _tmp5_;
-	gboolean _tmp6_;
 	AppWindow* _tmp8_;
 	AppWindow* _tmp9_;
 	SpitPublishingPublishable** _tmp10_;
@@ -1396,79 +1396,74 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 #line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_vala_assert (_tmp2_ > 0, "to_publish.size > 0");
 #line 164 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	use_header = FALSE;
+	_tmp3_ = resources_use_header_bar ();
+#line 164 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	use_header = _tmp3_ == 1;
 #line 165 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp3_ = gtk_settings_get_default ();
+	_tmp4_ = resources_use_header_bar ();
 #line 165 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
+	self = (PublishingUIPublishingDialog*) g_object_new (object_type, "use-header-bar", _tmp4_, NULL);
 #line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp5_ = use_header;
 #line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp5_) {
-#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp4_ = 1;
 #line 1411 "PublishingUI.c"
-	} else {
-#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp4_ = 0;
-#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);
+		GtkWidget* _tmp6_;
 #line 167 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp6_ = use_header;
+		_tmp6_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 167 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	if (_tmp6_) {
-#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 1429 "PublishingUI.c"
+		gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE);
+#line 1417 "PublishingUI.c"
+	} else {
+		GtkBox* _tmp7_;
+#line 169 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp7_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 169 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_box_set_spacing (_tmp7_, 6);
+#line 1424 "PublishingUI.c"
 	}
-#line 170 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 172 "/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 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp8_ = app_window_get_instance ();
-#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp9_ = _tmp8_;
-#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow));
-#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (_tmp9_);
-#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event, self, 0);
 #line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event, self, 0);
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp10_ = g_new0 (SpitPublishingPublishable*, 0 + 1);
-#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->publishables = _tmp10_;
-#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->publishables_length1 = 0;
-#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	has_photos = FALSE;
-#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	has_videos = FALSE;
-#line 1459 "PublishingUI.c"
+#line 1454 "PublishingUI.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp11_;
 		GeeIterator* _tmp12_;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp11_ = to_publish;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_media_it = _tmp12_;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		while (TRUE) {
-#line 1472 "PublishingUI.c"
+#line 1467 "PublishingUI.c"
 			GeeIterator* _tmp13_;
 			gboolean _tmp14_;
 			MediaSource* media = NULL;
@@ -1483,276 +1478,276 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 			gint _tmp23__length1;
 			SpitPublishingPublishable* _tmp24_;
 			SpitPublishingPublishable* _tmp25_;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp13_ = _media_it;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp14_ = gee_iterator_next (_tmp13_);
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			if (!_tmp14_) {
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				break;
-#line 1495 "PublishingUI.c"
+#line 1490 "PublishingUI.c"
 			}
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp15_ = _media_it;
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp16_ = gee_iterator_get (_tmp15_);
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			media = (MediaSource*) _tmp16_;
-#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp17_ = media;
-#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp18_ = publishing_glue_media_source_publishable_wrapper_new (_tmp17_);
-#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			publishable = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_PUBLISHABLE, SpitPublishingPublishable);
 #line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+			publishable = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_PUBLISHABLE, SpitPublishingPublishable);
+#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp19_ = publishable;
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp20_ = spit_publishing_publishable_get_media_type (_tmp19_);
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			if (_tmp20_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 182 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 184 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				has_photos = TRUE;
-#line 1517 "PublishingUI.c"
+#line 1512 "PublishingUI.c"
 			} else {
 				SpitPublishingPublishable* _tmp21_;
 				SpitPublishingPublisherMediaType _tmp22_;
-#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 185 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp21_ = publishable;
-#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 185 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp22_ = spit_publishing_publishable_get_media_type (_tmp21_);
-#line 183 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 185 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp22_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 184 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					has_videos = TRUE;
-#line 1529 "PublishingUI.c"
+#line 1524 "PublishingUI.c"
 				} else {
-#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					g_assert_not_reached ();
-#line 1533 "PublishingUI.c"
+#line 1528 "PublishingUI.c"
 				}
 			}
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp23_ = self->priv->publishables;
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp23__length1 = self->priv->publishables_length1;
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp24_ = publishable;
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp25_ = _g_object_ref0 (_tmp24_);
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_vala_array_add55 (&self->priv->publishables, &self->priv->publishables_length1, &self->priv->_publishables_size_, _tmp25_);
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+			_vala_array_add58 (&self->priv->publishables, &self->priv->publishables_length1, &self->priv->_publishables_size_, _tmp25_);
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_object_unref0 (publishable);
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_object_unref0 (media);
-#line 1550 "PublishingUI.c"
+#line 1545 "PublishingUI.c"
 		}
-#line 178 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (_media_it);
-#line 1554 "PublishingUI.c"
+#line 1549 "PublishingUI.c"
 	}
-#line 191 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	title = NULL;
-#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	label = NULL;
 #line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	label = NULL;
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27_ = has_photos;
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp27_) {
-#line 1564 "PublishingUI.c"
+#line 1559 "PublishingUI.c"
 		gboolean _tmp28_;
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp28_ = has_videos;
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp26_ = !_tmp28_;
-#line 1570 "PublishingUI.c"
+#line 1565 "PublishingUI.c"
 	} else {
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp26_ = FALSE;
-#line 1574 "PublishingUI.c"
+#line 1569 "PublishingUI.c"
 	}
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp26_) {
-#line 1578 "PublishingUI.c"
+#line 1573 "PublishingUI.c"
 		gchar* _tmp29_;
 		gchar* _tmp30_;
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp29_ = g_strdup (_ ("Publish Photos"));
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_free0 (title);
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		title = _tmp29_;
-#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp30_ = g_strdup (_ ("Publish photos _to:"));
-#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_free0 (label);
-#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		label = _tmp30_;
-#line 1593 "PublishingUI.c"
+#line 1588 "PublishingUI.c"
 	} else {
 		gboolean _tmp31_ = FALSE;
 		gboolean _tmp32_;
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp32_ = has_photos;
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (!_tmp32_) {
-#line 1601 "PublishingUI.c"
+#line 1596 "PublishingUI.c"
 			gboolean _tmp33_;
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp33_ = has_videos;
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp31_ = _tmp33_;
-#line 1607 "PublishingUI.c"
+#line 1602 "PublishingUI.c"
 		} else {
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp31_ = FALSE;
-#line 1611 "PublishingUI.c"
+#line 1606 "PublishingUI.c"
 		}
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (_tmp31_) {
-#line 1615 "PublishingUI.c"
+#line 1610 "PublishingUI.c"
 			gchar* _tmp34_;
 			gchar* _tmp35_;
-#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp34_ = g_strdup (_ ("Publish Videos"));
-#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (title);
-#line 198 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			title = _tmp34_;
-#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp35_ = g_strdup (_ ("Publish videos _to"));
-#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (label);
-#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			label = _tmp35_;
-#line 1630 "PublishingUI.c"
+#line 1625 "PublishingUI.c"
 		} else {
 			gchar* _tmp36_;
 			gchar* _tmp37_;
-#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp36_ = g_strdup (_ ("Publish Photos and Videos"));
-#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (title);
-#line 201 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			title = _tmp36_;
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp37_ = g_strdup (_ ("Publish photos and videos _to"));
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (label);
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			label = _tmp37_;
-#line 1646 "PublishingUI.c"
+#line 1641 "PublishingUI.c"
 		}
 	}
-#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_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), _tmp38_);
 #line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp38_);
+#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp39_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
-#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 208 "/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"
+#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->service_selector_box_model = _tmp39_;
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp40_ = self->priv->service_selector_box_model;
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_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"
+#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_object_ref_sink (_tmp41_);
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 209 "/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 = _tmp41_;
 #line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	self->priv->service_selector_box = _tmp41_;
+#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp42_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
-#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_object_ref_sink (_tmp42_);
-#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	renderer_pix = _tmp42_;
-#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp43_ = self->priv->service_selector_box;
-#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp44_ = renderer_pix;
-#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	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"
+#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp45_ = self->priv->service_selector_box;
-#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp46_ = renderer_pix;
-#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	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"
+	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 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp47_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_object_ref_sink (_tmp47_);
-#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	renderer_text = _tmp47_;
-#line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 216 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp48_ = self->priv->service_selector_box;
-#line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 216 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp49_ = renderer_text;
-#line 214 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 216 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	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"
+#line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp50_ = self->priv->service_selector_box;
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp51_ = renderer_text;
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	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"
+	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 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp52_ = self->priv->service_selector_box;
-#line 217 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_combo_box_set_active (_tmp52_, 0);
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp53_ = config_facade_get_instance ();
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp54_ = _tmp53_;
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_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"
+#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp56_ = _tmp55_;
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (_tmp54_);
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	last_used_service = _tmp56_;
 #line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	last_used_service = _tmp56_;
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp57_ = has_photos;
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp58_ = has_videos;
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp60_ = publishing_ui_publishing_dialog_load_services (_tmp57_, _tmp58_, &_tmp59_);
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	loaded_services = _tmp60_;
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	loaded_services_length1 = _tmp59_;
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_loaded_services_size_ = loaded_services_length1;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp61_ = loaded_services;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp61__length1 = loaded_services_length1;
-#line 1737 "PublishingUI.c"
+#line 1732 "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"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection = _tmp61_;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection_length1 = _tmp61__length1;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		for (service_it = 0; service_it < _tmp61__length1; service_it = service_it + 1) {
-#line 1749 "PublishingUI.c"
+#line 1744 "PublishingUI.c"
 			SpitPublishingService* _tmp62_;
 			SpitPublishingService* service = NULL;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp62_ = _g_object_ref0 (service_collection[service_it]);
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			service = _tmp62_;
-#line 1756 "PublishingUI.c"
+#line 1751 "PublishingUI.c"
 			{
 				GtkListStore* _tmp63_;
 				GtkTreeIter _tmp64_ = {0};
@@ -1766,53 +1761,53 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 				GdkPixbuf** _tmp71_;
 				gint _tmp71__length1;
 				const gchar* _tmp89_;
-#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp63_ = self->priv->service_selector_box_model;
-#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				gtk_list_store_append (_tmp63_, &_tmp64_);
-#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				iter = _tmp64_;
 #line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+				iter = _tmp64_;
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp65_ = service;
-#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_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"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp67_ = g_strdup (_tmp66_);
-#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				curr_service_id = _tmp67_;
 #line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+				curr_service_id = _tmp67_;
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp68_ = service;
-#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				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"
+				spit_pluggable_get_info (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, SPIT_TYPE_PLUGGABLE, SpitPluggable), &self->priv->info);
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp70_ = self->priv->info;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp71_ = _tmp70_.icons;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp71__length1 = _tmp70_.icons_length1;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (NULL != _tmp71_) {
-#line 1796 "PublishingUI.c"
+#line 1791 "PublishingUI.c"
 					SpitPluggableInfo _tmp72_;
 					GdkPixbuf** _tmp73_;
 					gint _tmp73__length1;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp72_ = self->priv->info;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp73_ = _tmp72_.icons;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp73__length1 = _tmp72_.icons_length1;
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp69_ = 0 < _tmp73__length1;
-#line 1808 "PublishingUI.c"
+#line 1803 "PublishingUI.c"
 				} else {
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp69_ = FALSE;
-#line 1812 "PublishingUI.c"
+#line 1807 "PublishingUI.c"
 				}
-#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp69_) {
-#line 1816 "PublishingUI.c"
+#line 1811 "PublishingUI.c"
 					GtkListStore* _tmp74_;
 					GtkTreeIter _tmp75_;
 					SpitPluggableInfo _tmp76_;
@@ -1823,33 +1818,33 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 					const gchar* _tmp80_;
 					GdkPixbuf* _tmp81_;
 					GdkPixbuf* _tmp82_;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp74_ = self->priv->service_selector_box_model;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp75_ = iter;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp76_ = self->priv->info;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp77_ = _tmp76_.icons;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp77__length1 = _tmp76_.icons_length1;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp78_ = _tmp77_[0];
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp79_ = service;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_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"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					gtk_list_store_set (_tmp74_, &_tmp75_, 0, _tmp78_, 1, _tmp80_, -1);
-#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp81_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
-#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 241 "/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"
+#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					self->priv->info.icons[0] = _tmp81_;
-#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp82_ = self->priv->info.icons[0];
-#line 1853 "PublishingUI.c"
+#line 1848 "PublishingUI.c"
 				} else {
 					GtkListStore* _tmp83_;
 					GtkTreeIter _tmp84_;
@@ -1857,89 +1852,89 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 					GdkPixbuf* _tmp86_;
 					SpitPublishingService* _tmp87_;
 					const gchar* _tmp88_;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp83_ = self->priv->service_selector_box_model;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp84_ = iter;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp85_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp86_ = _tmp85_;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp87_ = service;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_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"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					gtk_list_store_set (_tmp83_, &_tmp84_, 0, _tmp86_, 1, _tmp88_, -1);
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_object_unref0 (_tmp86_);
-#line 1877 "PublishingUI.c"
+#line 1872 "PublishingUI.c"
 				}
-#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp89_ = last_used_service;
-#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp89_ == NULL) {
-#line 1883 "PublishingUI.c"
+#line 1878 "PublishingUI.c"
 					GtkComboBox* _tmp90_;
 					GtkTreeIter _tmp91_;
 					SpitPublishingService* _tmp92_;
 					const gchar* _tmp93_;
 					gchar* _tmp94_;
-#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp90_ = self->priv->service_selector_box;
-#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp91_ = iter;
-#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					gtk_combo_box_set_active_iter (_tmp90_, &_tmp91_);
-#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp92_ = service;
-#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_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"
+#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp94_ = g_strdup (_tmp93_);
-#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_free0 (last_used_service);
-#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					last_used_service = _tmp94_;
-#line 1905 "PublishingUI.c"
+#line 1900 "PublishingUI.c"
 				} else {
 					const gchar* _tmp95_;
 					const gchar* _tmp96_;
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp95_ = last_used_service;
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp96_ = curr_service_id;
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if (g_strcmp0 (_tmp95_, _tmp96_) == 0) {
-#line 1915 "PublishingUI.c"
+#line 1910 "PublishingUI.c"
 						GtkComboBox* _tmp97_;
 						GtkTreeIter _tmp98_;
-#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp97_ = self->priv->service_selector_box;
-#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp98_ = iter;
-#line 250 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						gtk_combo_box_set_active_iter (_tmp97_, &_tmp98_);
-#line 1924 "PublishingUI.c"
+#line 1919 "PublishingUI.c"
 					}
 				}
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_free0 (curr_service_id);
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (service);
-#line 1931 "PublishingUI.c"
+#line 1926 "PublishingUI.c"
 			}
 		}
 	}
-#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp99_ = self->priv->service_selector_box;
-#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	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"
+	g_signal_connect_object (_tmp99_, "changed", (GCallback) _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp100_ = use_header;
-#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (!_tmp100_) {
-#line 1943 "PublishingUI.c"
+#line 1938 "PublishingUI.c"
 		GtkLabel* service_selector_box_label = NULL;
 		const gchar* _tmp101_;
 		GtkLabel* _tmp102_;
@@ -1972,196 +1967,196 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 		GtkBox* _tmp127_;
 		GtkBox* _tmp128_;
 		GtkBox* _tmp129_;
-#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp101_ = label;
-#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp102_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp101_);
-#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_object_ref_sink (_tmp102_);
-#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_selector_box_label = _tmp102_;
-#line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp103_ = service_selector_box_label;
-#line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp104_ = self->priv->service_selector_box;
-#line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 262 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp105_ = service_selector_box_label;
-#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 262 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 263 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp106_ = service_selector_box_label;
-#line 261 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 263 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp107_ = self->priv->service_selector_box;
-#line 267 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp108_ = self->priv->service_selector_box;
-#line 268 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp109_ = self->priv->service_selector_box;
-#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_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 (_tmp110_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp111_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-#line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_object_ref_sink (_tmp111_);
-#line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_selector_layouter = _tmp111_;
-#line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp112_ = service_selector_layouter;
-#line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp113_ = service_selector_layouter;
-#line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 277 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp114_ = service_selector_layouter;
-#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 277 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp115_ = service_selector_box_label;
-#line 275 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 277 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp116_ = service_selector_layouter;
-#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp117_ = self->priv->service_selector_box;
-#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp118_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_object_ref_sink (_tmp118_);
-#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_area_layouter = _tmp118_;
-#line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp119_ = service_area_layouter;
-#line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp120_ = service_selector_layouter;
-#line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp121_ = service_area_layouter;
-#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp122_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_object_ref_sink (_tmp122_);
-#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp123_ = _tmp122_;
-#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (_tmp123_);
-#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp124_ = service_area_layouter;
-#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp125_ = service_area_layouter;
-#line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 287 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp126_ = service_area_layouter;
-#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 287 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp127_ = service_area_layouter;
-#line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		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"
+		gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 290 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_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"
+#line 290 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp129_ = service_area_layouter;
-#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 290 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (service_area_layouter);
-#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (service_selector_layouter);
-#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (service_selector_box_label);
-#line 2092 "PublishingUI.c"
+#line 2087 "PublishingUI.c"
 	}
-#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp130_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_object_ref_sink (_tmp130_);
-#line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 293 "/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 = _tmp130_;
 #line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	self->priv->central_area_layouter = _tmp130_;
+#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_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"
+#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp132_ = self->priv->central_area_layouter;
-#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	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"
+	gtk_box_pack_start (_tmp131_, G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp133_ = use_header;
-#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp133_) {
-#line 2112 "PublishingUI.c"
+#line 2107 "PublishingUI.c"
 		GtkButton* _tmp134_;
 		GtkButton* _tmp135_;
 		GtkWidget* _tmp136_;
 		GtkButton* _tmp137_;
 		GtkWidget* _tmp138_;
 		GtkComboBox* _tmp139_;
-#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp134_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
-#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_object_ref_sink (_tmp134_);
-#line 296 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 298 "/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"
+#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		self->priv->close_cancel_button = _tmp134_;
-#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_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 (_tmp135_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_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"
+#line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp137_ = self->priv->close_cancel_button;
-#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_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"
+#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp139_ = self->priv->service_selector_box;
-#line 300 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 2138 "PublishingUI.c"
 	} else {
 		GtkWidget* _tmp140_;
 		GtkButton* _tmp141_;
-#line 303 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 305 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_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"
+#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_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"
+#line 306 "/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"
+#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		self->priv->close_cancel_button = _tmp141_;
-#line 2157 "PublishingUI.c"
+#line 2152 "PublishingUI.c"
 	}
-#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp142_ = self->priv->close_cancel_button;
-#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	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);
+	g_signal_connect_object (_tmp142_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
 #line 310 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	publishing_ui_publishing_dialog_set_standard_window_mode (self);
+#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	loaded_services = (_vala_array_free (loaded_services, loaded_services_length1, (GDestroyNotify) g_object_unref), NULL);
@@ -2177,65 +2172,65 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 	_g_free0 (title);
 #line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 2181 "PublishingUI.c"
+#line 2176 "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 2188 "PublishingUI.c"
+#line 2183 "PublishingUI.c"
 }
 
 
-static void _vala_array_add56 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void _vala_array_add59 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2199 "PublishingUI.c"
+#line 2194 "PublishingUI.c"
 	}
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2205 "PublishingUI.c"
+#line 2200 "PublishingUI.c"
 }
 
 
-static gint __lambda15_ (void* a, void* b) {
+static gint __lambda16_ (void* a, void* b) {
 	gint result = 0;
 	void* _tmp0_;
 	const gchar* _tmp1_;
 	void* _tmp2_;
 	const gchar* _tmp3_;
 	gint _tmp4_;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = a;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) _tmp0_), SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp2_ = b;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) _tmp2_), SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp4_ = utf8_cs_compare (_tmp1_, _tmp3_);
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _tmp4_;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2230 "PublishingUI.c"
+#line 2225 "PublishingUI.c"
 }
 
 
-static gint ___lambda15____compar_fn_t (void* key1, void* key2) {
+static gint ___lambda16____compar_fn_t (void* key1, void* key2) {
 	gint result;
-	result = __lambda15_ (key1, key2);
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	result = __lambda16_ (key1, key2);
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2239 "PublishingUI.c"
+#line 2234 "PublishingUI.c"
 }
 
 
@@ -2256,41 +2251,41 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 	gint _tmp26__length1;
 	SpitPublishingService** _tmp27_;
 	gint _tmp27__length1;
-#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 316 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = g_new0 (SpitPublishingService*, 0 + 1);
-#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 316 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	loaded_services = _tmp0_;
-#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 316 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	loaded_services_length1 = 0;
-#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 316 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_loaded_services_size_ = loaded_services_length1;
-#line 317 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 319 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = plugins_get_pluggables_for_type (SPIT_PUBLISHING_TYPE_SERVICE, NULL, NULL, NULL, FALSE);
-#line 317 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 319 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	pluggables = _tmp1_;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp2_ = pluggables;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp3_ = gee_collection_get_size (_tmp2_);
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp4_ = _tmp3_;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_debug ("PublishingUI.vala:320: PublisingDialog: discovered %d pluggable publis" \
+#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	g_debug ("PublishingUI.vala:322: PublisingDialog: discovered %d pluggable publis" \
 "hing services.", _tmp4_);
-#line 2280 "PublishingUI.c"
+#line 2275 "PublishingUI.c"
 	{
 		GeeIterator* _pluggable_it = NULL;
 		GeeCollection* _tmp5_;
 		GeeIterator* _tmp6_;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp5_ = pluggables;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_pluggable_it = _tmp6_;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		while (TRUE) {
-#line 2293 "PublishingUI.c"
+#line 2288 "PublishingUI.c"
 			GeeIterator* _tmp7_;
 			gboolean _tmp8_;
 			SpitPluggable* pluggable = NULL;
@@ -2309,167 +2304,167 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 			gint _tmp22__length1;
 			SpitPublishingService* _tmp23_;
 			SpitPublishingService* _tmp24_;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = _pluggable_it;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp8_ = gee_iterator_next (_tmp7_);
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			if (!_tmp8_) {
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				break;
-#line 2320 "PublishingUI.c"
+#line 2315 "PublishingUI.c"
 			}
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp9_ = _pluggable_it;
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp10_ = gee_iterator_get (_tmp9_);
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			pluggable = (SpitPluggable*) _tmp10_;
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp11_ = pluggable;
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp12_ = spit_pluggable_get_pluggable_interface (_tmp11_, SPIT_PUBLISHING_CURRENT_INTERFACE, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			pluggable_interface = _tmp12_;
 #line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+			pluggable_interface = _tmp12_;
+#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp13_ = pluggable_interface;
-#line 325 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			if (_tmp13_ != SPIT_PUBLISHING_CURRENT_INTERFACE) {
-#line 2338 "PublishingUI.c"
+#line 2333 "PublishingUI.c"
 				SpitPluggable* _tmp14_;
 				gchar* _tmp15_;
 				gchar* _tmp16_;
 				gint _tmp17_;
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp14_ = pluggable;
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp15_ = plugins_get_pluggable_module_id (_tmp14_);
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp16_ = _tmp15_;
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp17_ = pluggable_interface;
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				g_warning ("PublishingUI.vala:326: Unable to load publisher %s: reported interface" \
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+				g_warning ("PublishingUI.vala:328: Unable to load publisher %s: reported interface" \
 " %d.", _tmp16_, _tmp17_);
-#line 326 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_free0 (_tmp16_);
-#line 329 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 331 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (pluggable);
-#line 329 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 331 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				continue;
-#line 2359 "PublishingUI.c"
+#line 2354 "PublishingUI.c"
 			}
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 334 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp18_ = pluggable;
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 334 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService));
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 334 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			service = _tmp19_;
-#line 335 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 337 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp20_ = service;
-#line 335 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 337 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp21_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 335 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			g_debug ("PublishingUI.vala:335: PublishingDialog: discovered pluggable publishi" \
+#line 337 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+			g_debug ("PublishingUI.vala:337: PublishingDialog: discovered pluggable publishi" \
 "ng service '%s'.", _tmp21_);
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp22_ = loaded_services;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp22__length1 = loaded_services_length1;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp23_ = service;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_vala_array_add56 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp24_);
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+			_vala_array_add59 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp24_);
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_object_unref0 (service);
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_object_unref0 (pluggable);
-#line 2387 "PublishingUI.c"
+#line 2382 "PublishingUI.c"
 		}
-#line 322 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (_pluggable_it);
-#line 2391 "PublishingUI.c"
+#line 2386 "PublishingUI.c"
 	}
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp25_ = loaded_services;
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp25__length1 = loaded_services_length1;
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp26_ = loaded_services;
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp26__length1 = loaded_services_length1;
-#line 342 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	qsort (_tmp25_, (gsize) _tmp26__length1, (gsize) sizeof (SpitPublishingService*), ___lambda15____compar_fn_t);
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	qsort (_tmp25_, (gsize) _tmp26__length1, (gsize) sizeof (SpitPublishingService*), ___lambda16____compar_fn_t);
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27_ = loaded_services;
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27__length1 = loaded_services_length1;
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (result_length1) {
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*result_length1 = _tmp27__length1;
-#line 2411 "PublishingUI.c"
+#line 2406 "PublishingUI.c"
 	}
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _tmp27_;
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (pluggables);
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2419 "PublishingUI.c"
+#line 2414 "PublishingUI.c"
 }
 
 
-static void _vala_array_add57 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void _vala_array_add60 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2430 "PublishingUI.c"
+#line 2425 "PublishingUI.c"
 	}
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2436 "PublishingUI.c"
+#line 2431 "PublishingUI.c"
 }
 
 
-static void _vala_array_add58 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void _vala_array_add61 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2447 "PublishingUI.c"
+#line 2442 "PublishingUI.c"
 	}
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2453 "PublishingUI.c"
+#line 2448 "PublishingUI.c"
 }
 
 
-static void _vala_array_add59 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+static void _vala_array_add62 (SpitPublishingService** * array, int* length, int* size, SpitPublishingService* value) {
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2464 "PublishingUI.c"
+#line 2459 "PublishingUI.c"
 	}
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2470 "PublishingUI.c"
+#line 2465 "PublishingUI.c"
 }
 
 
@@ -2490,226 +2485,226 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
 	gint _tmp6__length1;
 	SpitPublishingService** _tmp32_;
 	gint _tmp32__length1;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = has_photos;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp1_) {
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp0_ = TRUE;
-#line 2497 "PublishingUI.c"
+#line 2492 "PublishingUI.c"
 	} else {
 		gboolean _tmp2_;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp2_ = has_videos;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp0_ = _tmp2_;
-#line 2504 "PublishingUI.c"
+#line 2499 "PublishingUI.c"
 	}
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_vala_assert (_tmp0_, "has_photos || has_videos");
 #line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	_vala_assert (_tmp0_, "has_photos || has_videos");
+#line 355 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp3_ = g_new0 (SpitPublishingService*, 0 + 1);
-#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 355 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	filtered_services = _tmp3_;
-#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 355 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	filtered_services_length1 = 0;
-#line 353 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 355 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_filtered_services_size_ = filtered_services_length1;
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp5_ = publishing_ui_publishing_dialog_load_all_services (&_tmp4_);
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	all_services = _tmp5_;
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	all_services_length1 = _tmp4_;
-#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_all_services_size_ = all_services_length1;
 #line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	_all_services_size_ = all_services_length1;
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp6_ = all_services;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp6__length1 = all_services_length1;
-#line 2528 "PublishingUI.c"
+#line 2523 "PublishingUI.c"
 	{
 		SpitPublishingService** service_collection = NULL;
 		gint service_collection_length1 = 0;
 		gint _service_collection_size_ = 0;
 		gint service_it = 0;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection = _tmp6_;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection_length1 = _tmp6__length1;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		for (service_it = 0; service_it < _tmp6__length1; service_it = service_it + 1) {
-#line 2540 "PublishingUI.c"
+#line 2535 "PublishingUI.c"
 			SpitPublishingService* _tmp7_;
 			SpitPublishingService* service = NULL;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/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"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			service = _tmp7_;
-#line 2547 "PublishingUI.c"
+#line 2542 "PublishingUI.c"
 			{
 				gboolean _tmp8_ = FALSE;
 				gboolean _tmp9_;
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp9_ = has_photos;
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp9_) {
-#line 2555 "PublishingUI.c"
+#line 2550 "PublishingUI.c"
 					gboolean _tmp10_;
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp10_ = has_videos;
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp8_ = !_tmp10_;
-#line 2561 "PublishingUI.c"
+#line 2556 "PublishingUI.c"
 				} else {
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp8_ = FALSE;
-#line 2565 "PublishingUI.c"
+#line 2560 "PublishingUI.c"
 				}
-#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp8_) {
-#line 2569 "PublishingUI.c"
+#line 2564 "PublishingUI.c"
 					SpitPublishingService* _tmp11_;
 					SpitPublishingPublisherMediaType _tmp12_;
-#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp11_ = service;
-#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/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"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if ((_tmp12_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 2578 "PublishingUI.c"
+#line 2573 "PublishingUI.c"
 						SpitPublishingService** _tmp13_;
 						gint _tmp13__length1;
 						SpitPublishingService* _tmp14_;
 						SpitPublishingService* _tmp15_;
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp13_ = filtered_services;
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp13__length1 = filtered_services_length1;
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp14_ = service;
-#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_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 2593 "PublishingUI.c"
+#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+						_vala_array_add60 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp15_);
+#line 2588 "PublishingUI.c"
 					}
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gboolean _tmp17_;
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp17_ = has_photos;
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if (!_tmp17_) {
-#line 2602 "PublishingUI.c"
+#line 2597 "PublishingUI.c"
 						gboolean _tmp18_;
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp18_ = has_videos;
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp16_ = _tmp18_;
-#line 2608 "PublishingUI.c"
+#line 2603 "PublishingUI.c"
 					} else {
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp16_ = FALSE;
-#line 2612 "PublishingUI.c"
+#line 2607 "PublishingUI.c"
 					}
-#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if (_tmp16_) {
-#line 2616 "PublishingUI.c"
+#line 2611 "PublishingUI.c"
 						SpitPublishingService* _tmp19_;
 						SpitPublishingPublisherMediaType _tmp20_;
-#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp19_ = service;
-#line 362 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 364 "/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"
+#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						if ((_tmp20_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0) {
-#line 2625 "PublishingUI.c"
+#line 2620 "PublishingUI.c"
 							SpitPublishingService** _tmp21_;
 							gint _tmp21__length1;
 							SpitPublishingService* _tmp22_;
 							SpitPublishingService* _tmp23_;
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp21_ = filtered_services;
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp21__length1 = filtered_services_length1;
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp22_ = service;
-#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_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 2640 "PublishingUI.c"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+							_vala_array_add61 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp23_);
+#line 2635 "PublishingUI.c"
 						}
 					} else {
 						gboolean _tmp24_ = FALSE;
 						SpitPublishingService* _tmp25_;
 						SpitPublishingPublisherMediaType _tmp26_;
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp25_ = service;
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/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"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						if ((_tmp26_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 2652 "PublishingUI.c"
+#line 2647 "PublishingUI.c"
 							SpitPublishingService* _tmp27_;
 							SpitPublishingPublisherMediaType _tmp28_;
-#line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 368 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp27_ = service;
-#line 366 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 368 "/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"
+#line 368 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp24_ = (_tmp28_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
-#line 2661 "PublishingUI.c"
+#line 2656 "PublishingUI.c"
 						} else {
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp24_ = FALSE;
-#line 2665 "PublishingUI.c"
+#line 2660 "PublishingUI.c"
 						}
-#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						if (_tmp24_) {
-#line 2669 "PublishingUI.c"
+#line 2664 "PublishingUI.c"
 							SpitPublishingService** _tmp29_;
 							gint _tmp29__length1;
 							SpitPublishingService* _tmp30_;
 							SpitPublishingService* _tmp31_;
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp29_ = filtered_services;
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp29__length1 = filtered_services_length1;
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp30_ = service;
-#line 367 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_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 2684 "PublishingUI.c"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+							_vala_array_add62 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp31_);
+#line 2679 "PublishingUI.c"
 						}
 					}
 				}
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (service);
-#line 2690 "PublishingUI.c"
+#line 2685 "PublishingUI.c"
 			}
 		}
 	}
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp32_ = filtered_services;
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp32__length1 = filtered_services_length1;
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (result_length1) {
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*result_length1 = _tmp32__length1;
-#line 2702 "PublishingUI.c"
+#line 2697 "PublishingUI.c"
 	}
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _tmp32_;
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	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"
+#line 373 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2710 "PublishingUI.c"
+#line 2705 "PublishingUI.c"
 }
 
 
@@ -2740,202 +2735,202 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
 	PublishingUIPublishingDialog* _tmp27_;
 	PublishingUIPublishingDialog* _tmp28_;
 	GTimer* _tmp29_;
-#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 387 "/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"
+#line 388 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = publishing_ui_publishing_dialog_active_instance;
-#line 386 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 388 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp0_ != NULL) {
-#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		return;
-#line 2749 "PublishingUI.c"
+#line 2744 "PublishingUI.c"
 	}
-#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 391 "/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"
+#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp1_ == NULL) {
-#line 2755 "PublishingUI.c"
+#line 2750 "PublishingUI.c"
 		GTimer* _tmp2_;
 		GTimer* _tmp3_;
 		GTimer* _tmp4_;
-#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp2_ = g_timer_new ();
-#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_timer_destroy0 (publishing_ui_publishing_dialog_since_last_start);
-#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_since_last_start = _tmp2_;
-#line 393 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp3_ = publishing_ui_publishing_dialog_since_last_start;
-#line 393 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_timer_stop (_tmp3_);
-#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = publishing_ui_publishing_dialog_since_last_start;
-#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_timer_reset (_tmp4_);
-#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_elapsed_is_valid = FALSE;
-#line 2775 "PublishingUI.c"
+#line 2770 "PublishingUI.c"
 	} else {
 		gdouble elapsed = 0.0;
 		GTimer* _tmp5_;
 		gdouble _tmp6_;
 		gboolean _tmp7_ = FALSE;
 		gdouble _tmp8_;
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 399 "/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"
+#line 399 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp6_ = g_timer_elapsed (_tmp5_, NULL);
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 399 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		elapsed = _tmp6_;
-#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp8_ = elapsed;
-#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (_tmp8_ < 0.05) {
-#line 2792 "PublishingUI.c"
+#line 2787 "PublishingUI.c"
 			gboolean _tmp9_;
-#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/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"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = _tmp9_;
-#line 2798 "PublishingUI.c"
+#line 2793 "PublishingUI.c"
 		} else {
-#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = FALSE;
-#line 2802 "PublishingUI.c"
+#line 2797 "PublishingUI.c"
 		}
-#line 398 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (_tmp7_) {
-#line 399 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			return;
-#line 2808 "PublishingUI.c"
+#line 2803 "PublishingUI.c"
 		}
 	}
-#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp10_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	photos = _tmp10_;
-#line 403 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 405 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp11_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 403 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 405 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	videos = _tmp11_;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp12_ = to_publish;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp13_ = photos;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp14_ = videos;
-#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	media_source_collection_filter_media (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	media_source_collection_filter_media (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp15_ = photos;
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp17_ = _tmp16_;
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp18_ = videos;
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp20_ = _tmp19_;
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp22_ = publishing_ui_publishing_dialog_load_services (_tmp17_ > 0, _tmp20_ > 0, &_tmp21_);
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	avail_services = _tmp22_;
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	avail_services_length1 = _tmp21_;
-#line 406 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 408 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_avail_services_size_ = avail_services_length1;
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 411 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp23_ = avail_services;
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 411 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp23__length1 = avail_services_length1;
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 411 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp23__length1 == 0) {
-#line 2853 "PublishingUI.c"
+#line 2848 "PublishingUI.c"
 		gchar* _tmp24_;
 		gchar* _tmp25_;
-#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_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."), "▸");
-#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp25_ = _tmp24_;
-#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		app_window_error_message_with_title (_ ("Unable to publish"), _tmp25_, NULL, FALSE);
-#line 412 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_free0 (_tmp25_);
-#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 418 "/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"
+#line 418 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (videos);
-#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 418 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (photos);
-#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 418 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		return;
-#line 2872 "PublishingUI.c"
+#line 2867 "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"
+	g_debug ("PublishingUI.vala:424: PublishingDialog.go( )");
+#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp26_ = to_publish;
-#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27_ = publishing_ui_publishing_dialog_new (_tmp26_);
-#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_object_ref_sink (_tmp27_);
-#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 426 "/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 = _tmp27_;
 #line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	publishing_ui_publishing_dialog_active_instance = _tmp27_;
+#line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp28_ = publishing_ui_publishing_dialog_active_instance;
-#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	publishing_ui_publishing_dialog_run (_tmp28_);
 #line 428 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	publishing_ui_publishing_dialog_run (_tmp28_);
+#line 430 "/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"
+#line 430 "/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"
+#line 433 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp29_ = publishing_ui_publishing_dialog_since_last_start;
-#line 431 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 433 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_timer_start (_tmp29_);
-#line 432 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 434 "/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"
+#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	avail_services = (_vala_array_free (avail_services, avail_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (videos);
-#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (photos);
-#line 2906 "PublishingUI.c"
+#line 2901 "PublishingUI.c"
 }
 
 
 static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self, GdkEventAny* evt) {
 	gboolean result = FALSE;
 	SpitPublishingConcretePublishingHost* _tmp0_;
-#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 437 "/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"
+#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (evt != NULL, FALSE);
-#line 436 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->host;
-#line 436 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 438 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	spit_publishing_plugin_host_stop_publishing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost));
-#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 439 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->host);
-#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 439 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->host = NULL;
-#line 438 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 440 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 439 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 441 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 443 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = TRUE;
-#line 441 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 443 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2933 "PublishingUI.c"
+#line 2928 "PublishingUI.c"
 }
 
 
@@ -2971,253 +2966,253 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
 	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"
+	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
+#line 448 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	have_active_iter = FALSE;
-#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
-#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	iter = _tmp1_;
-#line 447 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	have_active_iter = _tmp2_;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp3_ = have_active_iter;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (!_tmp3_) {
-#line 2985 "PublishingUI.c"
+#line 2980 "PublishingUI.c"
 		GtkComboBox* _tmp4_;
 		GtkComboBox* _tmp5_;
 		GtkTreeIter _tmp6_ = {0};
-#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 454 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = self->priv->service_selector_box;
-#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 454 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_combo_box_set_active (_tmp4_, 0);
-#line 455 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp5_ = self->priv->service_selector_box;
-#line 455 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_combo_box_get_active_iter (_tmp5_, &_tmp6_);
-#line 455 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		iter = _tmp6_;
-#line 2999 "PublishingUI.c"
+#line 2994 "PublishingUI.c"
 	}
-#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp7_ = self->priv->service_selector_box_model;
-#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp8_ = iter;
-#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp8_, 1, &_tmp9_);
-#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL;
-#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	service_name_val = _tmp9_;
 #line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	service_name_val = _tmp9_;
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp10_ = service_name_val;
-#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp11_ = g_strdup (g_value_get_string (&_tmp10_));
-#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	service_name = _tmp11_;
 #line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	service_name = _tmp11_;
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	selected_service = NULL;
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp13_ = publishing_ui_publishing_dialog_load_all_services (&_tmp12_);
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	services = _tmp13_;
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	services_length1 = _tmp12_;
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_services_size_ = services_length1;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp14_ = services;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp14__length1 = services_length1;
-#line 3031 "PublishingUI.c"
+#line 3026 "PublishingUI.c"
 	{
 		SpitPublishingService** service_collection = NULL;
 		gint service_collection_length1 = 0;
 		gint _service_collection_size_ = 0;
 		gint service_it = 0;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection = _tmp14_;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection_length1 = _tmp14__length1;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		for (service_it = 0; service_it < _tmp14__length1; service_it = service_it + 1) {
-#line 3043 "PublishingUI.c"
+#line 3038 "PublishingUI.c"
 			SpitPublishingService* _tmp15_;
 			SpitPublishingService* service = NULL;
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/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"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			service = _tmp15_;
-#line 3050 "PublishingUI.c"
+#line 3045 "PublishingUI.c"
 			{
 				SpitPublishingService* _tmp16_;
 				const gchar* _tmp17_;
 				const gchar* _tmp18_;
-#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp16_ = service;
-#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp17_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp18_ = service_name;
-#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
-#line 3063 "PublishingUI.c"
+#line 3058 "PublishingUI.c"
 					SpitPublishingService* _tmp19_;
 					SpitPublishingService* _tmp20_;
-#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp19_ = service;
-#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_object_unref0 (selected_service);
-#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					selected_service = _tmp20_;
-#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 470 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_object_unref0 (service);
-#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 470 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					break;
-#line 3078 "PublishingUI.c"
+#line 3073 "PublishingUI.c"
 				}
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (service);
-#line 3082 "PublishingUI.c"
+#line 3077 "PublishingUI.c"
 			}
 		}
 	}
-#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp21_ = selected_service;
-#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_vala_assert (_tmp21_ != NULL, "selected_service != null");
 #line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	_vala_assert (_tmp21_ != NULL, "selected_service != null");
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp22_ = config_facade_get_instance ();
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp23_ = _tmp22_;
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp24_ = selected_service;
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp25_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	configuration_facade_set_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp25_);
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_g_object_unref0 (_tmp23_);
 #line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	_g_object_unref0 (_tmp23_);
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp26_ = selected_service;
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27_ = self->priv->publishables;
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27__length1 = self->priv->publishables_length1;
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp28_ = spit_publishing_concrete_publishing_host_new (_tmp26_, self, _tmp27_, _tmp27__length1);
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->host);
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->host = _tmp28_;
-#line 476 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 478 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp29_ = self->priv->host;
-#line 476 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 478 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	spit_publishing_concrete_publishing_host_start_publishing (_tmp29_);
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (selected_service);
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_free0 (service_name);
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL;
-#line 3126 "PublishingUI.c"
+#line 3121 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_on_close_cancel_clicked (PublishingUIPublishingDialog* self) {
 	SpitPublishingConcretePublishingHost* _tmp0_;
-#line 479 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 481 "/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"
-	g_debug ("PublishingUI.vala:480: PublishingDialog: on_close_cancel_clicked( ): i" \
-"nvoked.");
 #line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	g_debug ("PublishingUI.vala:482: PublishingDialog: on_close_cancel_clicked( ): i" \
+"nvoked.");
+#line 484 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->host;
-#line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 484 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	spit_publishing_plugin_host_stop_publishing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost));
-#line 483 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 485 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->host);
-#line 483 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 485 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->host = NULL;
-#line 484 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 486 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 485 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 487 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 3148 "PublishingUI.c"
+#line 3143 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_large_window_mode (PublishingUIPublishingDialog* self) {
 	GtkBox* _tmp0_;
-#line 488 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 490 "/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"
+#line 491 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT);
-#line 490 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 492 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->central_area_layouter;
-#line 490 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	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_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 494 "/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 3164 "PublishingUI.c"
+#line 3159 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_colossal_window_mode (PublishingUIPublishingDialog* self) {
 	GtkBox* _tmp0_;
-#line 495 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 497 "/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"
+#line 498 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT);
-#line 497 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 499 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->central_area_layouter;
-#line 497 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	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_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 501 "/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 3180 "PublishingUI.c"
+#line 3175 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_standard_window_mode (PublishingUIPublishingDialog* self) {
 	GtkBox* _tmp0_;
-#line 502 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 504 "/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"
+#line 505 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT);
-#line 504 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 506 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->central_area_layouter;
-#line 504 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	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_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 508 "/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 3196 "PublishingUI.c"
+#line 3191 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_free_sizable_window_mode (PublishingUIPublishingDialog* self) {
-#line 509 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 511 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 510 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 512 "/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 3205 "PublishingUI.c"
+#line 3200 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_clear_free_sizable_window_mode (PublishingUIPublishingDialog* self) {
-#line 513 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 515 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 514 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 516 "/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 3214 "PublishingUI.c"
+#line 3209 "PublishingUI.c"
 }
 
 
@@ -3225,70 +3220,70 @@ SpitPublishingDialogPane* publishing_ui_publishing_dialog_get_active_pane (Publi
 	SpitPublishingDialogPane* result = NULL;
 	SpitPublishingDialogPane* _tmp0_;
 	SpitPublishingDialogPane* _tmp1_;
-#line 517 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 519 "/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"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->active_pane;
-#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _tmp1_;
-#line 518 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 3232 "PublishingUI.c"
+#line 3227 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_set_close_button_mode (PublishingUIPublishingDialog* self) {
 	GtkButton* _tmp0_;
 	GtkButton* _tmp1_;
-#line 521 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 523 "/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"
+#line 524 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->close_cancel_button;
-#line 522 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 524 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_button_set_label (_tmp0_, _ ("_Close"));
-#line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = self->priv->close_cancel_button;
-#line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 525 "/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 (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 3249 "PublishingUI.c"
+#line 3244 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublishingDialog* self) {
 	GtkButton* _tmp0_;
-#line 526 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 528 "/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"
+#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->close_cancel_button;
-#line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_button_set_label (_tmp0_, _ ("_Cancel"));
-#line 3261 "PublishingUI.c"
+#line 3256 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self) {
 	GtkComboBox* _tmp0_;
-#line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 532 "/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"
+#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
-#line 531 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 533 "/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 3273 "PublishingUI.c"
+#line 3268 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self) {
 	GtkComboBox* _tmp0_;
-#line 534 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 536 "/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"
+#line 537 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
-#line 535 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 537 "/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 3285 "PublishingUI.c"
+#line 3280 "PublishingUI.c"
 }
 
 
@@ -3306,110 +3301,110 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog*
 	SpitPublishingDialogPane* _tmp15_;
 	SpitPublishingDialogPane* _tmp16_;
 	SpitPublishingDialogPane* _tmp17_;
-#line 538 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 540 "/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"
+#line 540 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (pane));
-#line 539 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_debug ("PublishingUI.vala:539: PublishingDialog: install_pane( ): invoked.");
 #line 541 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	g_debug ("PublishingUI.vala:541: PublishingDialog: install_pane( ): invoked.");
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->active_pane;
-#line 541 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp0_ != NULL) {
-#line 3313 "PublishingUI.c"
+#line 3308 "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.");
 #line 544 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		g_debug ("PublishingUI.vala:544: PublishingDialog: install_pane( ): a pane is al" \
+"ready installed; removing it.");
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp1_ = self->priv->active_pane;
-#line 544 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		spit_publishing_dialog_pane_on_pane_uninstalled (_tmp1_);
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp2_ = self->priv->central_area_layouter;
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp3_ = self->priv->active_pane;
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = spit_publishing_dialog_pane_get_widget (_tmp3_);
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp5_ = _tmp4_;
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		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"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (_tmp5_);
-#line 3337 "PublishingUI.c"
+#line 3332 "PublishingUI.c"
 	}
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp6_ = self->priv->central_area_layouter;
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp7_ = pane;
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp8_ = spit_publishing_dialog_pane_get_widget (_tmp7_);
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp9_ = _tmp8_;
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_box_pack_start (_tmp6_, _tmp9_, TRUE, TRUE, (guint) 0);
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (_tmp9_);
-#line 549 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp10_ = pane;
-#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp11_ = spit_publishing_dialog_pane_get_preferred_geometry (_tmp10_);
-#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	geometry_options = _tmp11_;
 #line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	geometry_options = _tmp11_;
+#line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp12_ = geometry_options;
-#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) {
-#line 554 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 556 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_set_large_window_mode (self);
-#line 3365 "PublishingUI.c"
+#line 3360 "PublishingUI.c"
 	} else {
 		SpitPublishingDialogPaneGeometryOptions _tmp13_;
-#line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 557 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp13_ = geometry_options;
-#line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 557 "/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"
+#line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			publishing_ui_publishing_dialog_set_colossal_window_mode (self);
-#line 3374 "PublishingUI.c"
+#line 3369 "PublishingUI.c"
 		} else {
-#line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 560 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			publishing_ui_publishing_dialog_set_standard_window_mode (self);
-#line 3378 "PublishingUI.c"
+#line 3373 "PublishingUI.c"
 		}
 	}
-#line 560 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 562 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp14_ = geometry_options;
-#line 560 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 562 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) {
-#line 561 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_set_free_sizable_window_mode (self);
-#line 3387 "PublishingUI.c"
+#line 3382 "PublishingUI.c"
 	} else {
-#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_clear_free_sizable_window_mode (self);
-#line 3391 "PublishingUI.c"
+#line 3386 "PublishingUI.c"
 	}
-#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp15_ = pane;
-#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->active_pane);
-#line 565 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->active_pane = _tmp16_;
-#line 566 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 568 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp17_ = pane;
-#line 566 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 568 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	spit_publishing_dialog_pane_on_pane_installed (_tmp17_);
-#line 3405 "PublishingUI.c"
+#line 3400 "PublishingUI.c"
 }
 
 
@@ -3417,23 +3412,23 @@ gint publishing_ui_publishing_dialog_run (PublishingUIPublishingDialog* self) {
 	gint result = 0;
 	gint _result_ = 0;
 	gint _tmp0_;
-#line 569 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 571 "/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"
-	publishing_ui_publishing_dialog_on_service_changed (self);
 #line 572 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	publishing_ui_publishing_dialog_on_service_changed (self);
+#line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 572 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_result_ = _tmp0_;
 #line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	_result_ = _tmp0_;
+#line 576 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->host);
-#line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self->priv->host = NULL;
 #line 576 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	self->priv->host = NULL;
+#line 578 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _result_;
-#line 576 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 578 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 3429 "PublishingUI.c"
+#line 3424 "PublishingUI.c"
 }
 
 
@@ -3444,14 +3439,14 @@ 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 3440 "PublishingUI.c"
+#line 3435 "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 3447 "PublishingUI.c"
+#line 3442 "PublishingUI.c"
 }
 
 
@@ -3477,7 +3472,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 3473 "PublishingUI.c"
+#line 3468 "PublishingUI.c"
 }
 
 
diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala
index c975564..3d4f609 100644
--- a/src/publishing/PublishingUI.vala
+++ b/src/publishing/PublishingUI.vala
@@ -161,11 +161,13 @@ public class PublishingDialog : Gtk.Dialog {
     protected PublishingDialog(Gee.Collection<MediaSource> to_publish) {
         assert(to_publish.size > 0);
 
-        bool use_header = false;
-        Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
-        Object(use_header_bar: use_header ? 1 : 0);
-        if (use_header)
+        bool use_header = Resources.use_header_bar() == 1;
+        Object(use_header_bar: Resources.use_header_bar());
+        if (use_header) {
             ((Gtk.HeaderBar) get_header_bar()).set_show_close_button(false);
+        } else {
+            get_content_area().set_spacing(6);
+        }
 
         resizable = false;
         modal = true;
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2018-05-01 14:35:32 +0200
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2018-05-01 14:35:32 +0200
commit	e230b6f78546827521107be23797048482c8b193 (patch)
tree	948c1e77382c484819ea399bba4edcdc19cc6bf0 /src/publishing
parent	211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff)
parent	49120f48474fc8fdc2448c75d961bc238213cfac (diff)