New upstream version 0.25.3upstream/0.25.3

4 files changed, 29 insertions, 29 deletions

diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c
index 329e415..690d2b3 100644
--- a/src/publishing/APIGlue.c
+++ b/src/publishing/APIGlue.c
@@ -1,4 +1,4 @@
-/* APIGlue.c generated by valac 0.32.1, the Vala compiler
+/* APIGlue.c generated by valac 0.34.4, the Vala compiler
  * generated from APIGlue.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -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 __catch36_g_error;
+			goto __catch38_g_error;
 		}
 	}
-	goto __finally36;
-	__catch36_g_error:
+	goto __finally38;
+	__catch38_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp5_ = NULL;
@@ -444,7 +444,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 		_g_error_free0 (err);
 #line 446 "APIGlue.c"
 	}
-	__finally36:
+	__finally38:
 #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 __catch37_g_error;
+				goto __catch39_g_error;
 			}
 		}
-		goto __finally37;
-		__catch37_g_error:
+		goto __finally39;
+		__catch39_g_error:
 		{
 			GError* err = NULL;
 			LibraryPhoto* _tmp25_ = NULL;
@@ -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 __finally37;
+			goto __finally39;
 		}
-		__finally37:
+		__finally39:
 #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 __catch38_g_error;
+					goto __catch40_g_error;
 				}
 			}
-			goto __finally38;
-			__catch38_g_error:
+			goto __finally40;
+			__catch40_g_error:
 			{
 				GError* err = NULL;
 				Video* _tmp56_ = NULL;
@@ -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 __finally38;
+				goto __finally40;
 			}
-			__finally38:
+			__finally40:
 #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"
diff --git a/src/publishing/Publishing.c b/src/publishing/Publishing.c
index fc14775..ca7ade6 100644
--- a/src/publishing/Publishing.c
+++ b/src/publishing/Publishing.c
@@ -1,4 +1,4 @@
-/* Publishing.c generated by valac 0.32.1, the Vala compiler
+/* Publishing.c generated by valac 0.34.4, the Vala compiler
  * generated from Publishing.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/publishing/PublishingPluginHost.c b/src/publishing/PublishingPluginHost.c
index 94f48ea..49208ca 100644
--- a/src/publishing/PublishingPluginHost.c
+++ b/src/publishing/PublishingPluginHost.c
@@ -1,4 +1,4 @@
-/* PublishingPluginHost.c generated by valac 0.32.1, the Vala compiler
+/* PublishingPluginHost.c generated by valac 0.34.4, the Vala compiler
  * generated from PublishingPluginHost.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1273,7 +1273,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 1272 "PublishingPluginHost.c"
-							goto __catch35_spit_publishing_publishing_error;
+							goto __catch37_spit_publishing_publishing_error;
 						}
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 						_g_object_unref0 (wrapper);
@@ -1293,8 +1293,8 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					_g_object_unref0 (wrapper);
 #line 1291 "PublishingPluginHost.c"
 				}
-				goto __finally35;
-				__catch35_spit_publishing_publishing_error:
+				goto __finally37;
+				__catch37_spit_publishing_publishing_error:
 				{
 					GError* err = NULL;
 					GError* _tmp16_ = NULL;
@@ -1331,7 +1331,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					return result;
 #line 1329 "PublishingPluginHost.c"
 				}
-				__finally35:
+				__finally37:
 #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 36d6265..311216d 100644
--- a/src/publishing/PublishingUI.c
+++ b/src/publishing/PublishingUI.c
@@ -1,4 +1,4 @@
-/* PublishingUI.c generated by valac 0.32.1, the Vala compiler
+/* PublishingUI.c generated by valac 0.34.4, the Vala compiler
  * generated from PublishingUI.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -478,9 +478,9 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 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);
+static gint __lambda14_ (void* a, void* b);
 gint utf8_cs_compare (void* a, void* b);
-static gint ___lambda15____compar_fn_t (void* key1, void* key2);
+static gint ___lambda14____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);
@@ -1643,7 +1643,7 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 #line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp42_);
 #line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp43_ = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING, -1);
+	_tmp43_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
 #line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->service_selector_box_model);
 #line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -2201,7 +2201,7 @@ static void _vala_array_add56 (SpitPublishingService*** array, int* length, int*
 }
 
 
-static gint __lambda15_ (void* a, void* b) {
+static gint __lambda14_ (void* a, void* b) {
 	gint result = 0;
 	void* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
@@ -2226,9 +2226,9 @@ static gint __lambda15_ (void* a, void* b) {
 }
 
 
-static gint ___lambda15____compar_fn_t (void* key1, void* key2) {
+static gint ___lambda14____compar_fn_t (void* key1, void* key2) {
 	gint result;
-	result = __lambda15_ (key1, key2);
+	result = __lambda14_ (key1, key2);
 #line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
 #line 2235 "PublishingUI.c"
@@ -2397,7 +2397,7 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 #line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp26__length1 = loaded_services_length1;
 #line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	qsort (_tmp25_, (gsize) _tmp26__length1, (gsize) sizeof (SpitPublishingService*), ___lambda15____compar_fn_t);
+	qsort (_tmp25_, (gsize) _tmp26__length1, (gsize) sizeof (SpitPublishingService*), ___lambda14____compar_fn_t);
 #line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27_ = loaded_services;
 #line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"