Merge tag 'upstream/0.25.3'

Upstream version 0.25.3

1 files changed, 23 insertions, 23 deletions

diff --git a/src/core/DataSource.c b/src/core/DataSource.c
index cb4dfca..3009d24 100644
--- a/src/core/DataSource.c
+++ b/src/core/DataSource.c
@@ -1,4 +1,4 @@
-/* DataSource.c generated by valac 0.32.1, the Vala compiler
+/* DataSource.c generated by valac 0.34.4, the Vala compiler
  * generated from DataSource.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2387,7 +2387,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2389 "DataSource.c"
-				goto __catch47_g_error;
+				goto __catch49_g_error;
 			}
 #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			ret = _tmp1_;
@@ -2409,8 +2409,8 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 #line 2409 "DataSource.c"
 			}
 		}
-		goto __finally47;
-		__catch47_g_error:
+		goto __finally49;
+		__catch49_g_error:
 		{
 			GError* err = NULL;
 			gchar* _tmp6_ = NULL;
@@ -2439,7 +2439,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 			_g_error_free0 (err);
 #line 2440 "DataSource.c"
 		}
-		__finally47:
+		__finally49:
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -3356,19 +3356,19 @@ static gchar* string_strip (const gchar* self) {
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 3373 "DataSource.c"
 }
@@ -3499,17 +3499,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 3514 "DataSource.c"
 }
@@ -3745,15 +3745,15 @@ static gint64 int64_parse (const gchar* str) {
 	gint64 result = 0LL;
 	const gchar* _tmp0_ = NULL;
 	gint64 _tmp1_ = 0LL;
-#line 679 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, 0LL);
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0);
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
 #line 3758 "DataSource.c"
 }