Merge tag 'upstream/3.17.3'

Upstream version 3.17.3

1 files changed, 52 insertions, 52 deletions

diff --git a/src/simple-scan.c b/src/simple-scan.c
index f474954..38e44ab 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -1,4 +1,4 @@
-/* simple-scan.c generated by valac 0.26.2, the Vala compiler
+/* simple-scan.c generated by valac 0.28.0, the Vala compiler
  * generated from simple-scan.vala, do not modify */
 
 /*
@@ -2697,37 +2697,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1198 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1198 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 2712 "simple-scan.c"
 		glong _tmp4_ = 0L;
-#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
 #line 2720 "simple-scan.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
 #line 2732 "simple-scan.c"
 	}
@@ -2747,112 +2747,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1208 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 2756 "simple-scan.c"
 		glong _tmp2_ = 0L;
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 2762 "simple-scan.c"
 	} else {
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 2766 "simple-scan.c"
 	}
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 2770 "simple-scan.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 2782 "simple-scan.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 2792 "simple-scan.c"
 	}
-#line 1217 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1217 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 2798 "simple-scan.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1219 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1219 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 2812 "simple-scan.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 2822 "simple-scan.c"
 	}
-#line 1223 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1223 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1223 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1223 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 2828 "simple-scan.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 2837 "simple-scan.c"
 	}
-#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
 #line 2857 "simple-scan.c"
 }