From 6f674ee5c209ae295a32211c9c86807aa06999a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Wed, 22 Mar 2017 21:40:05 +0100
Subject: New upstream version 3.24.0

---
 src/page.c | 68 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

(limited to 'src/page.c')

diff --git a/src/page.c b/src/page.c
index 0f9681f..9a3db07 100644
--- a/src/page.c
+++ b/src/page.c
@@ -1,4 +1,4 @@
-/* page.c generated by valac 0.34.2, the Vala compiler
+/* page.c generated by valac 0.34.6, the Vala compiler
  * generated from page.vala, do not modify */
 
 /*
@@ -4659,24 +4659,26 @@ static gboolean pixbuf_writer_write_pixbuf_data (PixbufWriter* self, guint8* buf
 	g_output_stream_write_all ((GOutputStream*) _tmp0_, _tmp1_, (gsize) _tmp1__length1, NULL, NULL, &_inner_error_);
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 4663 "page.c"
+		gboolean _tmp2_ = FALSE;
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_propagate_error (error, _inner_error_);
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		return FALSE;
-#line 4667 "page.c"
+		return _tmp2_;
+#line 4669 "page.c"
 	}
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = TRUE;
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4673 "page.c"
+#line 4675 "page.c"
 }
 
 
 static void value_pixbuf_writer_init (GValue* value) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	value->data[0].v_pointer = NULL;
-#line 4680 "page.c"
+#line 4682 "page.c"
 }
 
 
@@ -4685,7 +4687,7 @@ static void value_pixbuf_writer_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (value->data[0].v_pointer);
-#line 4689 "page.c"
+#line 4691 "page.c"
 	}
 }
 
@@ -4695,11 +4697,11 @@ static void value_pixbuf_writer_copy_value (const GValue* src_value, GValue* des
 	if (src_value->data[0].v_pointer) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = pixbuf_writer_ref (src_value->data[0].v_pointer);
-#line 4699 "page.c"
+#line 4701 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4703 "page.c"
+#line 4705 "page.c"
 	}
 }
 
@@ -4707,37 +4709,37 @@ static void value_pixbuf_writer_copy_value (const GValue* src_value, GValue* des
 static gpointer value_pixbuf_writer_peek_pointer (const GValue* value) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
-#line 4711 "page.c"
+#line 4713 "page.c"
 }
 
 
 static gchar* value_pixbuf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (collect_values[0].v_pointer) {
-#line 4718 "page.c"
+#line 4720 "page.c"
 		PixbufWriter* object;
 		object = collect_values[0].v_pointer;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4725 "page.c"
+#line 4727 "page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.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 4729 "page.c"
+#line 4731 "page.c"
 		}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = pixbuf_writer_ref (object);
-#line 4733 "page.c"
+#line 4735 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4737 "page.c"
+#line 4739 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
-#line 4741 "page.c"
+#line 4743 "page.c"
 }
 
 
@@ -4748,25 +4750,25 @@ static gchar* value_pixbuf_writer_lcopy_value (const GValue* value, guint n_coll
 	if (!object_p) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4752 "page.c"
+#line 4754 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!value->data[0].v_pointer) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = NULL;
-#line 4758 "page.c"
+#line 4760 "page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4762 "page.c"
+#line 4764 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = pixbuf_writer_ref (value->data[0].v_pointer);
-#line 4766 "page.c"
+#line 4768 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
-#line 4770 "page.c"
+#line 4772 "page.c"
 }
 
 
@@ -4780,7 +4782,7 @@ GParamSpec* param_spec_pixbuf_writer (const gchar* name, const gchar* nick, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return G_PARAM_SPEC (spec);
-#line 4784 "page.c"
+#line 4786 "page.c"
 }
 
 
@@ -4789,7 +4791,7 @@ gpointer value_get_pixbuf_writer (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXBUF_WRITER), NULL);
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
-#line 4793 "page.c"
+#line 4795 "page.c"
 }
 
 
@@ -4809,17 +4811,17 @@ void value_set_pixbuf_writer (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_ref (value->data[0].v_pointer);
-#line 4813 "page.c"
+#line 4815 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4817 "page.c"
+#line 4819 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (old);
-#line 4823 "page.c"
+#line 4825 "page.c"
 	}
 }
 
@@ -4838,17 +4840,17 @@ void value_take_pixbuf_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 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = v_object;
-#line 4842 "page.c"
+#line 4844 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4846 "page.c"
+#line 4848 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (old);
-#line 4852 "page.c"
+#line 4854 "page.c"
 	}
 }
 
@@ -4858,14 +4860,14 @@ static void pixbuf_writer_class_init (PixbufWriterClass * klass) {
 	pixbuf_writer_parent_class = g_type_class_peek_parent (klass);
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	((PixbufWriterClass *) klass)->finalize = pixbuf_writer_finalize;
-#line 4862 "page.c"
+#line 4864 "page.c"
 }
 
 
 static void pixbuf_writer_instance_init (PixbufWriter * self) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->ref_count = 1;
-#line 4869 "page.c"
+#line 4871 "page.c"
 }
 
 
@@ -4877,7 +4879,7 @@ static void pixbuf_writer_finalize (PixbufWriter* obj) {
 	g_signal_handlers_destroy (self);
 #line 694 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (self->stream);
-#line 4881 "page.c"
+#line 4883 "page.c"
 }
 
 
@@ -4902,7 +4904,7 @@ gpointer pixbuf_writer_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return instance;
-#line 4906 "page.c"
+#line 4908 "page.c"
 }
 
 
@@ -4915,7 +4917,7 @@ void pixbuf_writer_unref (gpointer instance) {
 		PIXBUF_WRITER_GET_CLASS (self)->finalize (self);
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4919 "page.c"
+#line 4921 "page.c"
 	}
 }
 
-- 
cgit v1.2.3