Merge tag 'upstream/3.15.4'

Upstream version 3.15.4

1 files changed, 176 insertions, 170 deletions

diff --git a/src/book.c b/src/book.c
index 45fd555..8bfd63a 100644
--- a/src/book.c
+++ b/src/book.c
@@ -1,4 +1,4 @@
-/* book.c generated by valac 0.24.0, the Vala compiler
+/* book.c generated by valac 0.26.1, 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.24/vapi/glib-2.0.vapi"
+#line 930 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) (-1), _tmp1_);
-#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 933 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 933 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 933 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 933 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 850 "book.c"
 		gchar* _tmp4_ = NULL;
-#line 934 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 934 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 934 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		return result;
 #line 858 "book.c"
 	} else {
-#line 936 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 936 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		result = -1;
-#line 936 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 936 "/usr/share/vala-0.26/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 1226 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1230 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1227 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1227 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1227 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1228 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1228 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
 #line 898 "book.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1229 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1229 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1229 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
 #line 907 "book.c"
 	}
-#line 1231 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1231 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
 #line 913 "book.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1232 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1232 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1232 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
 #line 922 "book.c"
 	}
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
 #line 928 "book.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
 #line 937 "book.c"
 	} else {
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
 #line 941 "book.c"
 	}
-#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
 #line 949 "book.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
 #line 958 "book.c"
 	} else {
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
 #line 962 "book.c"
 	}
-#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1236 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1236 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1236 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	return result;
 #line 984 "book.c"
 }
@@ -1298,7 +1298,7 @@ static void book_save_multi_file (Book* self, const gchar* type, gint quality, G
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp12_);
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_inner_error_ != NULL) {
+				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -1391,7 +1391,7 @@ static void book_save_ps (Book* self, GFile* file, GError** error) {
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream = _tmp1_;
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_propagate_error (error, _inner_error_);
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -1834,7 +1834,7 @@ static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, g
 #line 240 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		gdk_pixbuf_save_to_callbackv (_tmp14_, _book_write_pixbuf_data_gdk_pixbuf_save_func, self, "jpeg", keys, values, &_inner_error_);
 #line 240 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1839 "book.c"
 			goto __catch0_g_error;
 		}
@@ -1853,7 +1853,7 @@ static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, g
 	}
 	__finally0:
 #line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
 #line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -2121,7 +2121,7 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 #line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream = _tmp10_;
 #line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_propagate_error (error, _inner_error_);
 #line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -4318,7 +4318,7 @@ void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError
 #line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_multi_file (self, _tmp4_, _tmp5_, _tmp6_, &_inner_error_);
 #line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_inner_error_ != NULL) {
+				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
 #line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -4342,7 +4342,7 @@ void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError
 #line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_ps (self, _tmp7_, &_inner_error_);
 #line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_inner_error_ != NULL) {
+				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
 #line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -4369,7 +4369,7 @@ void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_pdf (self, _tmp8_, _tmp9_, &_inner_error_);
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_inner_error_ != NULL) {
+				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -4659,7 +4659,7 @@ static void book_class_init (BookClass * klass) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_parent_class = g_type_class_peek_parent (klass);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	BOOK_CLASS (klass)->finalize = book_finalize;
+	((BookClass *) klass)->finalize = book_finalize;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_type_class_add_private (klass, sizeof (BookPrivate));
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
@@ -4692,9 +4692,11 @@ static void book_finalize (Book* obj) {
 	GList* _tmp0_ = NULL;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BOOK, Book);
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_signal_handlers_destroy (self);
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
-#line 4698 "book.c"
+#line 4700 "book.c"
 	{
 		GList* page_collection = NULL;
 		GList* page_it = NULL;
@@ -4702,14 +4704,14 @@ static void book_finalize (Book* obj) {
 		page_collection = _tmp0_;
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		for (page_it = page_collection; page_it != NULL; page_it = page_it->next) {
-#line 4706 "book.c"
+#line 4708 "book.c"
 			Page* _tmp1_ = NULL;
 			Page* page = NULL;
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp1_ = _page_ref0 ((Page*) page_it->data);
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			page = _tmp1_;
-#line 4713 "book.c"
+#line 4715 "book.c"
 			{
 				Page* _tmp2_ = NULL;
 				guint _tmp3_ = 0U;
@@ -4729,7 +4731,7 @@ static void book_finalize (Book* obj) {
 				g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _book_page_changed_cb_page_crop_changed, self);
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
-#line 4733 "book.c"
+#line 4735 "book.c"
 			}
 		}
 	}
@@ -4737,7 +4739,7 @@ static void book_finalize (Book* obj) {
 	__g_list_free__page_unref0_0 (self->priv->pages);
 #line 231 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_byte_array_unref0 (self->priv->jpeg_data);
-#line 4741 "book.c"
+#line 4743 "book.c"
 }
 
 
@@ -4762,7 +4764,7 @@ gpointer book_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
-#line 4766 "book.c"
+#line 4768 "book.c"
 }
 
 
@@ -4775,7 +4777,7 @@ void book_unref (gpointer instance) {
 		BOOK_GET_CLASS (self)->finalize (self);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4779 "book.c"
+#line 4781 "book.c"
 	}
 }
 
@@ -4783,7 +4785,7 @@ void book_unref (gpointer instance) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 4787 "book.c"
+#line 4789 "book.c"
 }
 
 
@@ -4805,14 +4807,14 @@ PDFWriter* pdf_writer_construct (GType object_type, GFileOutputStream* stream) {
 	self->priv->stream = _tmp1_;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
-#line 4809 "book.c"
+#line 4811 "book.c"
 }
 
 
 PDFWriter* pdf_writer_new (GFileOutputStream* stream) {
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return pdf_writer_construct (TYPE_PDF_WRITER, stream);
-#line 4816 "book.c"
+#line 4818 "book.c"
 }
 
 
@@ -4823,7 +4825,7 @@ void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
 	GError * _inner_error_ = NULL;
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 4827 "book.c"
+#line 4829 "book.c"
 	{
 		GFileOutputStream* _tmp0_ = NULL;
 		guint8* _tmp1_ = NULL;
@@ -4837,8 +4839,8 @@ void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
 #line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_output_stream_write_all ((GOutputStream*) _tmp0_, _tmp1_, (gsize) _tmp1__length1, NULL, NULL, &_inner_error_);
 #line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		if (_inner_error_ != NULL) {
-#line 4842 "book.c"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 4844 "book.c"
 			goto __catch1_g_error;
 		}
 	}
@@ -4860,18 +4862,18 @@ void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
 		g_warning ("book.vala:591: Error writing PDF: %s", _tmp3_);
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_error_free0 (e);
-#line 4864 "book.c"
+#line 4866 "book.c"
 	}
 	__finally1:
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		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 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_clear_error (&_inner_error_);
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
-#line 4875 "book.c"
+#line 4877 "book.c"
 	}
 #line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = self->offset;
@@ -4881,7 +4883,7 @@ void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
 	_tmp5__length1 = data_length1;
 #line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->offset = _tmp4_ + _tmp5__length1;
-#line 4885 "book.c"
+#line 4887 "book.c"
 }
 
 
@@ -4900,49 +4902,49 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
 	gint _tmp6_ = 0;
 	gchar* _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
-#line 1303 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp1_ + 1;
-#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	__result__size_ = _result__length1;
-#line 1305 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1309 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp3_ = _result__length1;
-#line 1305 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1309 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp3_ - 1;
-#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp4_ = _result_;
-#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _result__length1;
-#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp5_ = strlen (self);
-#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp6_ = _tmp5_;
-#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	memcpy (_tmp4_, self, (gsize) _tmp6_);
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp7_ = _result_;
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp7__length1 = _result__length1;
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp7__length1;
-#line 4940 "book.c"
+#line 4942 "book.c"
 	}
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	result = _tmp7_;
-#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	return result;
-#line 4946 "book.c"
+#line 4948 "book.c"
 }
 
 
@@ -4968,7 +4970,7 @@ void pdf_writer_write_string (PDFWriter* self, const gchar* text) {
 	pdf_writer_write (self, _tmp3_, (_tmp1_ * sizeof (gchar)) / sizeof (guint8));
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = (g_free (_tmp3_), NULL);
-#line 4972 "book.c"
+#line 4974 "book.c"
 }
 
 
@@ -4991,14 +4993,14 @@ guint pdf_writer_start_object (PDFWriter* self) {
 	result = _tmp2_;
 #line 604 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 4995 "book.c"
+#line 4997 "book.c"
 }
 
 
 static void value_pdf_writer_init (GValue* value) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
-#line 5002 "book.c"
+#line 5004 "book.c"
 }
 
 
@@ -5007,7 +5009,7 @@ static void value_pdf_writer_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (value->data[0].v_pointer);
-#line 5011 "book.c"
+#line 5013 "book.c"
 	}
 }
 
@@ -5017,11 +5019,11 @@ static void value_pdf_writer_copy_value (const GValue* src_value, GValue* dest_v
 	if (src_value->data[0].v_pointer) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = pdf_writer_ref (src_value->data[0].v_pointer);
-#line 5021 "book.c"
+#line 5023 "book.c"
 	} else {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5025 "book.c"
+#line 5027 "book.c"
 	}
 }
 
@@ -5029,37 +5031,37 @@ static void value_pdf_writer_copy_value (const GValue* src_value, GValue* dest_v
 static gpointer value_pdf_writer_peek_pointer (const GValue* value) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 5033 "book.c"
+#line 5035 "book.c"
 }
 
 
 static gchar* value_pdf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
-#line 5040 "book.c"
+#line 5042 "book.c"
 		PDFWriter* object;
 		object = collect_values[0].v_pointer;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5047 "book.c"
+#line 5049 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5051 "book.c"
+#line 5053 "book.c"
 		}
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = pdf_writer_ref (object);
-#line 5055 "book.c"
+#line 5057 "book.c"
 	} else {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5059 "book.c"
+#line 5061 "book.c"
 	}
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 5063 "book.c"
+#line 5065 "book.c"
 }
 
 
@@ -5070,25 +5072,25 @@ static gchar* value_pdf_writer_lcopy_value (const GValue* value, guint n_collect
 	if (!object_p) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5074 "book.c"
+#line 5076 "book.c"
 	}
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
-#line 5080 "book.c"
+#line 5082 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5084 "book.c"
+#line 5086 "book.c"
 	} else {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = pdf_writer_ref (value->data[0].v_pointer);
-#line 5088 "book.c"
+#line 5090 "book.c"
 	}
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 5092 "book.c"
+#line 5094 "book.c"
 }
 
 
@@ -5102,7 +5104,7 @@ GParamSpec* param_spec_pdf_writer (const gchar* name, const gchar* nick, const g
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
-#line 5106 "book.c"
+#line 5108 "book.c"
 }
 
 
@@ -5111,7 +5113,7 @@ gpointer value_get_pdf_writer (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PDF_WRITER), NULL);
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 5115 "book.c"
+#line 5117 "book.c"
 }
 
 
@@ -5131,17 +5133,17 @@ void value_set_pdf_writer (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_ref (value->data[0].v_pointer);
-#line 5135 "book.c"
+#line 5137 "book.c"
 	} else {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5139 "book.c"
+#line 5141 "book.c"
 	}
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (old);
-#line 5145 "book.c"
+#line 5147 "book.c"
 	}
 }
 
@@ -5160,17 +5162,17 @@ void value_take_pdf_writer (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 5164 "book.c"
+#line 5166 "book.c"
 	} else {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5168 "book.c"
+#line 5170 "book.c"
 	}
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (old);
-#line 5174 "book.c"
+#line 5176 "book.c"
 	}
 }
 
@@ -5179,10 +5181,10 @@ static void pdf_writer_class_init (PDFWriterClass * klass) {
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_parent_class = g_type_class_peek_parent (klass);
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	PDF_WRITER_CLASS (klass)->finalize = pdf_writer_finalize;
+	((PDFWriterClass *) klass)->finalize = pdf_writer_finalize;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_type_class_add_private (klass, sizeof (PDFWriterPrivate));
-#line 5186 "book.c"
+#line 5188 "book.c"
 }
 
 
@@ -5193,7 +5195,7 @@ static void pdf_writer_instance_init (PDFWriter * self) {
 	self->offset = (gsize) 0;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
-#line 5197 "book.c"
+#line 5199 "book.c"
 }
 
 
@@ -5201,11 +5203,13 @@ static void pdf_writer_finalize (PDFWriter* obj) {
 	PDFWriter * self;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PDF_WRITER, PDFWriter);
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_signal_handlers_destroy (self);
 #line 575 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_list_free0 (self->object_offsets);
 #line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->priv->stream);
-#line 5209 "book.c"
+#line 5213 "book.c"
 }
 
 
@@ -5230,7 +5234,7 @@ gpointer pdf_writer_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
-#line 5234 "book.c"
+#line 5238 "book.c"
 }
 
 
@@ -5243,7 +5247,7 @@ void pdf_writer_unref (gpointer instance) {
 		PDF_WRITER_GET_CLASS (self)->finalize (self);
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5247 "book.c"
+#line 5251 "book.c"
 	}
 }
 
@@ -5253,7 +5257,7 @@ static cairo_status_t _ps_writer_write_cairo_data_cairo_write_func_t (gpointer s
 	result = ps_writer_write_cairo_data ((PsWriter*) self, data, data_length1);
 #line 616 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 5257 "book.c"
+#line 5261 "book.c"
 }
 
 
@@ -5282,14 +5286,14 @@ PsWriter* ps_writer_construct (GType object_type, GFileOutputStream* stream) {
 	self->surface = _tmp2_;
 #line 613 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
-#line 5286 "book.c"
+#line 5290 "book.c"
 }
 
 
 PsWriter* ps_writer_new (GFileOutputStream* stream) {
 #line 613 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return ps_writer_construct (TYPE_PS_WRITER, stream);
-#line 5293 "book.c"
+#line 5297 "book.c"
 }
 
 
@@ -5298,7 +5302,7 @@ static cairo_status_t ps_writer_write_cairo_data (PsWriter* self, guint8* data,
 	GError * _inner_error_ = NULL;
 #line 619 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 5302 "book.c"
+#line 5306 "book.c"
 	{
 		GFileOutputStream* _tmp0_ = NULL;
 		guint8* _tmp1_ = NULL;
@@ -5312,8 +5316,8 @@ static cairo_status_t ps_writer_write_cairo_data (PsWriter* self, guint8* data,
 #line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_output_stream_write_all ((GOutputStream*) _tmp0_, _tmp1_, (gsize) _tmp1__length1, NULL, NULL, &_inner_error_);
 #line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		if (_inner_error_ != NULL) {
-#line 5317 "book.c"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 5321 "book.c"
 			goto __catch2_g_error;
 		}
 	}
@@ -5339,31 +5343,31 @@ static cairo_status_t ps_writer_write_cairo_data (PsWriter* self, guint8* data,
 		_g_error_free0 (e);
 #line 628 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return result;
-#line 5343 "book.c"
+#line 5347 "book.c"
 	}
 	__finally2:
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		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 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_clear_error (&_inner_error_);
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return 0;
-#line 5354 "book.c"
+#line 5358 "book.c"
 	}
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = CAIRO_STATUS_SUCCESS;
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 5360 "book.c"
+#line 5364 "book.c"
 }
 
 
 static void value_ps_writer_init (GValue* value) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
-#line 5367 "book.c"
+#line 5371 "book.c"
 }
 
 
@@ -5372,7 +5376,7 @@ static void value_ps_writer_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (value->data[0].v_pointer);
-#line 5376 "book.c"
+#line 5380 "book.c"
 	}
 }
 
@@ -5382,11 +5386,11 @@ static void value_ps_writer_copy_value (const GValue* src_value, GValue* dest_va
 	if (src_value->data[0].v_pointer) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = ps_writer_ref (src_value->data[0].v_pointer);
-#line 5386 "book.c"
+#line 5390 "book.c"
 	} else {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5390 "book.c"
+#line 5394 "book.c"
 	}
 }
 
@@ -5394,37 +5398,37 @@ static void value_ps_writer_copy_value (const GValue* src_value, GValue* dest_va
 static gpointer value_ps_writer_peek_pointer (const GValue* value) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 5398 "book.c"
+#line 5402 "book.c"
 }
 
 
 static gchar* value_ps_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
-#line 5405 "book.c"
+#line 5409 "book.c"
 		PsWriter* object;
 		object = collect_values[0].v_pointer;
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5412 "book.c"
+#line 5416 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5416 "book.c"
+#line 5420 "book.c"
 		}
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = ps_writer_ref (object);
-#line 5420 "book.c"
+#line 5424 "book.c"
 	} else {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5424 "book.c"
+#line 5428 "book.c"
 	}
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 5428 "book.c"
+#line 5432 "book.c"
 }
 
 
@@ -5435,25 +5439,25 @@ static gchar* value_ps_writer_lcopy_value (const GValue* value, guint n_collect_
 	if (!object_p) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5439 "book.c"
+#line 5443 "book.c"
 	}
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
-#line 5445 "book.c"
+#line 5449 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5449 "book.c"
+#line 5453 "book.c"
 	} else {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = ps_writer_ref (value->data[0].v_pointer);
-#line 5453 "book.c"
+#line 5457 "book.c"
 	}
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 5457 "book.c"
+#line 5461 "book.c"
 }
 
 
@@ -5467,7 +5471,7 @@ GParamSpec* param_spec_ps_writer (const gchar* name, const gchar* nick, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
-#line 5471 "book.c"
+#line 5475 "book.c"
 }
 
 
@@ -5476,7 +5480,7 @@ gpointer value_get_ps_writer (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PS_WRITER), NULL);
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 5480 "book.c"
+#line 5484 "book.c"
 }
 
 
@@ -5496,17 +5500,17 @@ void value_set_ps_writer (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_ref (value->data[0].v_pointer);
-#line 5500 "book.c"
+#line 5504 "book.c"
 	} else {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5504 "book.c"
+#line 5508 "book.c"
 	}
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (old);
-#line 5510 "book.c"
+#line 5514 "book.c"
 	}
 }
 
@@ -5525,17 +5529,17 @@ void value_take_ps_writer (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 5529 "book.c"
+#line 5533 "book.c"
 	} else {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5533 "book.c"
+#line 5537 "book.c"
 	}
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (old);
-#line 5539 "book.c"
+#line 5543 "book.c"
 	}
 }
 
@@ -5544,15 +5548,15 @@ static void ps_writer_class_init (PsWriterClass * klass) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	ps_writer_parent_class = g_type_class_peek_parent (klass);
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	PS_WRITER_CLASS (klass)->finalize = ps_writer_finalize;
-#line 5549 "book.c"
+	((PsWriterClass *) klass)->finalize = ps_writer_finalize;
+#line 5553 "book.c"
 }
 
 
 static void ps_writer_instance_init (PsWriter * self) {
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
-#line 5556 "book.c"
+#line 5560 "book.c"
 }
 
 
@@ -5560,11 +5564,13 @@ static void ps_writer_finalize (PsWriter* obj) {
 	PsWriter * self;
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PS_WRITER, PsWriter);
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_signal_handlers_destroy (self);
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_surface_destroy0 (self->surface);
 #line 611 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->stream);
-#line 5568 "book.c"
+#line 5574 "book.c"
 }
 
 
@@ -5589,7 +5595,7 @@ gpointer ps_writer_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
-#line 5593 "book.c"
+#line 5599 "book.c"
 }
 
 
@@ -5602,7 +5608,7 @@ void ps_writer_unref (gpointer instance) {
 		PS_WRITER_GET_CLASS (self)->finalize (self);
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5606 "book.c"
+#line 5612 "book.c"
 	}
 }