Merge branch 'feature/upstream' into develop

1 files changed, 10 insertions, 10 deletions

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"