Update upstream source from tag 'upstream/0.28.2'

Update to upstream version '0.28.2'
with Debian dir 811236a8e9a1308bf427065dcb6270419ff4f965

1 files changed, 27 insertions, 27 deletions

diff --git a/plugins/shotwell-publishing/YouTubePublishing.c b/plugins/shotwell-publishing/YouTubePublishing.c
index 4be28b4..c94360b 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.c
+++ b/plugins/shotwell-publishing/YouTubePublishing.c
@@ -349,7 +349,7 @@ static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base,
 static const gchar* you_tube_service_real_get_id (SpitPluggable* base);
 static const gchar* you_tube_service_real_get_pluggable_name (SpitPluggable* base);
 static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup9 (GdkPixbuf** self, int length);
+static GdkPixbuf** _vala_array_dup11 (GdkPixbuf** self, int length);
 static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
 PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
 PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
@@ -437,9 +437,9 @@ static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_
 static void publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (PublishingYouTubePublishingOptionsPane* self);
 static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_new (const gchar* description, PublishingYouTubePrivacySetting privacy_setting);
 static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_construct (GType object_type, const gchar* description, PublishingYouTubePrivacySetting privacy_setting);
-static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
-static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add35 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add36 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
+static void _vala_array_add37 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
 static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
 static SpitPublishingDialogPaneGeometryOptions publishing_you_tube_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
 static void publishing_you_tube_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
@@ -576,7 +576,7 @@ static gpointer _g_object_ref0 (gpointer self) {
 }
 
 
-static GdkPixbuf** _vala_array_dup9 (GdkPixbuf** self, int length) {
+static GdkPixbuf** _vala_array_dup11 (GdkPixbuf** self, int length) {
 	GdkPixbuf** result;
 	int i;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -663,7 +663,7 @@ static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableIn
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7__length1 = you_tube_service_icon_pixbuf_set_length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup9 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup11 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8__length1 = _tmp7__length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1742,11 +1742,11 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1740 "YouTubePublishing.c"
-			goto __catch20_g_error;
+			goto __catch25_g_error;
 		}
 	}
-	goto __finally20;
-	__catch20_g_error:
+	goto __finally25;
+	__catch25_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp2_;
@@ -1783,7 +1783,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 		return;
 #line 1779 "YouTubePublishing.c"
 	}
-	__finally20:
+	__finally25:
 #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2469,7 +2469,7 @@ static void publishing_you_tube_publishing_options_pane_update_publish_button_se
 }
 
 
-static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+static void _vala_array_add35 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2486,7 +2486,7 @@ static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDesc
 }
 
 
-static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+static void _vala_array_add36 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2503,7 +2503,7 @@ static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDesc
 }
 
 
-static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+static void _vala_array_add37 (PublishingYouTubePublishingOptionsPanePrivacyDescription** * array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2554,7 +2554,7 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_ ("Public listed"), PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC);
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp2_);
+	_vala_array_add35 (&_result_, &_result__length1, &__result__size_, _tmp2_);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = _result_;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2562,7 +2562,7 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_ ("Public unlisted"), PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add33 (&_result_, &_result__length1, &__result__size_, _tmp4_);
+	_vala_array_add36 (&_result_, &_result__length1, &__result__size_, _tmp4_);
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = _result_;
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2570,7 +2570,7 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp6_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_ ("Private"), PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE);
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add34 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add37 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7_ = _result_;
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3143,11 +3143,11 @@ static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3139 "YouTubePublishing.c"
-			goto __catch22_g_error;
+			goto __catch27_g_error;
 		}
 	}
-	goto __finally22;
-	__catch22_g_error:
+	goto __finally27;
+	__catch27_g_error:
 	{
 		GError* _error_ = NULL;
 		GError* _tmp1_;
@@ -3166,7 +3166,7 @@ static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
 		_g_error_free0 (_error_);
 #line 3161 "YouTubePublishing.c"
 	}
-	__finally22:
+	__finally27:
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3350,7 +3350,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_data1_ = NULL;
 #line 3346 "YouTubePublishing.c"
-			goto __catch21_g_error;
+			goto __catch26_g_error;
 		}
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp24_ = self->priv->youtube_service;
@@ -3375,7 +3375,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_data1_ = NULL;
 #line 3371 "YouTubePublishing.c"
-			goto __catch21_g_error;
+			goto __catch26_g_error;
 		}
 #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp30_ = file;
@@ -3394,7 +3394,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 #line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_data1_ = NULL;
 #line 3390 "YouTubePublishing.c"
-			goto __catch21_g_error;
+			goto __catch26_g_error;
 		}
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp32_ = g_main_loop_new (NULL, FALSE);
@@ -3433,7 +3433,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_data1_ = NULL;
 #line 3429 "YouTubePublishing.c"
-			goto __catch21_g_error;
+			goto __catch26_g_error;
 		}
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp41_ = _tmp37_;
@@ -3457,8 +3457,8 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 		_data1_ = NULL;
 #line 3452 "YouTubePublishing.c"
 	}
-	goto __finally21;
-	__catch21_g_error:
+	goto __finally26;
+	__catch26_g_error:
 	{
 		GError* _error_ = NULL;
 		GError* _tmp42_;
@@ -3477,7 +3477,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 		_g_error_free0 (_error_);
 #line 3472 "YouTubePublishing.c"
 	}
-	__finally21:
+	__finally26:
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"