Merge tag 'upstream/3.21.90'

Upstream version 3.21.90

1 files changed, 52 insertions, 52 deletions

diff --git a/src/scanner.c b/src/scanner.c
index 1db0c10..cdbbd35 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -1,4 +1,4 @@
-/* scanner.c generated by valac 0.30.1, the Vala compiler
+/* scanner.c generated by valac 0.32.1, the Vala compiler
  * generated from scanner.vala, do not modify */
 
 /*
@@ -4421,17 +4421,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1278 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1278 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1279 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1279 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1279 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1279 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 4437 "scanner.c"
 }
@@ -4738,11 +4738,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1282 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1282 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1282 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
 #line 4748 "scanner.c"
 	{
@@ -4757,73 +4757,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 4779 "scanner.c"
 				goto __catch15_g_regex_error;
 			}
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1284 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 4788 "scanner.c"
 		}
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 4804 "scanner.c"
 				goto __catch15_g_regex_error;
 			}
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 			return NULL;
 #line 4815 "scanner.c"
 		}
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1285 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return result;
 #line 4829 "scanner.c"
 	}
@@ -4831,24 +4831,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	__catch15_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1287 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
 #line 4843 "scanner.c"
 	}
 	__finally15:
-#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1283 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 		return NULL;
 #line 4854 "scanner.c"
 	}
@@ -6274,15 +6274,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 996 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 997 "/usr/share/vala-0.30/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 6282 "scanner.c"
 }