Merge tag 'upstream/3.17.3'

Upstream version 3.17.3

1 files changed, 70 insertions, 70 deletions

diff --git a/src/book.c b/src/book.c
index d25c072..969c8de 100644
--- a/src/book.c
+++ b/src/book.c
@@ -1,4 +1,4 @@
-/* book.c generated by valac 0.26.2, the Vala compiler
+/* book.c generated by valac 0.28.0, the Vala compiler
  * generated from book.vala, do not modify */
 
 /*
@@ -832,33 +832,33 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 930 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 930 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) (-1), _tmp1_);
-#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 933 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 933 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 933 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 933 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 850 "book.c"
 		gchar* _tmp4_ = NULL;
-#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
 #line 858 "book.c"
 	} else {
-#line 936 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 936 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		result = -1;
-#line 936 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 936 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
 #line 864 "book.c"
 	}
@@ -882,103 +882,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1230 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1230 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1232 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1232 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
 #line 898 "book.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
 #line 907 "book.c"
 	}
-#line 1235 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1235 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
 #line 913 "book.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
 #line 922 "book.c"
 	}
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
 #line 928 "book.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
 #line 937 "book.c"
 	} else {
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
 #line 941 "book.c"
 	}
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
 #line 949 "book.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
 #line 958 "book.c"
 	} else {
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
 #line 962 "book.c"
 	}
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
 #line 984 "book.c"
 }
@@ -4902,47 +4902,47 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
 	gint _tmp6_ = 0;
 	gchar* _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
-#line 1307 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp1_ + 1;
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	__result__size_ = _result__length1;
-#line 1309 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1309 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp3_ = _result__length1;
-#line 1309 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1309 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp3_ - 1;
-#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp4_ = _result_;
-#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _result__length1;
-#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp5_ = strlen (self);
-#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp6_ = _tmp5_;
-#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	memcpy (_tmp4_, self, (gsize) _tmp6_);
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp7_ = _result_;
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp7__length1 = _result__length1;
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp7__length1;
 #line 4942 "book.c"
 	}
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	result = _tmp7_;
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
 #line 4948 "book.c"
 }