Merge tag 'upstream/3.17.1'

Upstream version 3.17.1

1 files changed, 3613 insertions, 3613 deletions

diff --git a/src/scanner.c b/src/scanner.c
index a049b9c..d32dcd9 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -977,32 +977,32 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 
 ScanDevice* scan_device_construct (GType object_type) {
 	ScanDevice* self = NULL;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (ScanDevice*) g_type_create_instance (object_type);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 985 "scanner.c"
 }
 
 
 ScanDevice* scan_device_new (void) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_device_construct (TYPE_SCAN_DEVICE);
 #line 992 "scanner.c"
 }
 
 
 static void value_scan_device_init (GValue* value) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 999 "scanner.c"
 }
 
 
 static void value_scan_device_free_value (GValue* value) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (value->data[0].v_pointer);
 #line 1008 "scanner.c"
 	}
@@ -1010,13 +1010,13 @@ static void value_scan_device_free_value (GValue* value) {
 
 
 static void value_scan_device_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_device_ref (src_value->data[0].v_pointer);
 #line 1018 "scanner.c"
 	} else {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 1022 "scanner.c"
 	}
@@ -1024,37 +1024,37 @@ static void value_scan_device_copy_value (const GValue* src_value, GValue* dest_
 
 
 static gpointer value_scan_device_peek_pointer (const GValue* value) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 1030 "scanner.c"
 }
 
 
 static gchar* value_scan_device_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 1037 "scanner.c"
 		ScanDevice* object;
 		object = collect_values[0].v_pointer;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 1044 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.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 1048 "scanner.c"
 		}
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_device_ref (object);
 #line 1052 "scanner.c"
 	} else {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1056 "scanner.c"
 	}
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 1060 "scanner.c"
 }
@@ -1063,27 +1063,27 @@ static gchar* value_scan_device_collect_value (GValue* value, guint n_collect_va
 static gchar* value_scan_device_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ScanDevice** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 1071 "scanner.c"
 	}
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 1077 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 1081 "scanner.c"
 	} else {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_device_ref (value->data[0].v_pointer);
 #line 1085 "scanner.c"
 	}
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 1089 "scanner.c"
 }
@@ -1091,22 +1091,22 @@ static gchar* value_scan_device_lcopy_value (const GValue* value, guint n_collec
 
 GParamSpec* param_spec_scan_device (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanDevice* spec;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCAN_DEVICE), NULL);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 1103 "scanner.c"
 }
 
 
 gpointer value_get_scan_device (const GValue* value) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_DEVICE), NULL);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 1112 "scanner.c"
 }
@@ -1114,29 +1114,29 @@ gpointer value_get_scan_device (const GValue* value) {
 
 void value_set_scan_device (GValue* value, gpointer v_object) {
 	ScanDevice* old;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_DEVICE));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_DEVICE));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_ref (value->data[0].v_pointer);
 #line 1132 "scanner.c"
 	} else {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1136 "scanner.c"
 	}
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (old);
 #line 1142 "scanner.c"
 	}
@@ -1145,27 +1145,27 @@ void value_set_scan_device (GValue* value, gpointer v_object) {
 
 void value_take_scan_device (GValue* value, gpointer v_object) {
 	ScanDevice* old;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_DEVICE));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_DEVICE));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 1161 "scanner.c"
 	} else {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1165 "scanner.c"
 	}
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (old);
 #line 1171 "scanner.c"
 	}
@@ -1173,16 +1173,16 @@ void value_take_scan_device (GValue* value, gpointer v_object) {
 
 
 static void scan_device_class_init (ScanDeviceClass * klass) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_device_parent_class = g_type_class_peek_parent (klass);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((ScanDeviceClass *) klass)->finalize = scan_device_finalize;
 #line 1181 "scanner.c"
 }
 
 
 static void scan_device_instance_init (ScanDevice * self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 1188 "scanner.c"
 }
@@ -1190,13 +1190,13 @@ static void scan_device_instance_init (ScanDevice * self) {
 
 static void scan_device_finalize (ScanDevice* obj) {
 	ScanDevice * self;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_DEVICE, ScanDevice);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
-#line 16 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 16 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->name);
-#line 17 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->label);
 #line 1202 "scanner.c"
 }
@@ -1219,9 +1219,9 @@ GType scan_device_get_type (void) {
 gpointer scan_device_ref (gpointer instance) {
 	ScanDevice* self;
 	self = instance;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 1227 "scanner.c"
 }
@@ -1230,11 +1230,11 @@ gpointer scan_device_ref (gpointer instance) {
 void scan_device_unref (gpointer instance) {
 	ScanDevice* self;
 	self = instance;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCAN_DEVICE_GET_CLASS (self)->finalize (self);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 1240 "scanner.c"
 	}
@@ -1243,32 +1243,32 @@ void scan_device_unref (gpointer instance) {
 
 ScanPageInfo* scan_page_info_construct (GType object_type) {
 	ScanPageInfo* self = NULL;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (ScanPageInfo*) g_type_create_instance (object_type);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 1251 "scanner.c"
 }
 
 
 ScanPageInfo* scan_page_info_new (void) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_page_info_construct (TYPE_SCAN_PAGE_INFO);
 #line 1258 "scanner.c"
 }
 
 
 static void value_scan_page_info_init (GValue* value) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 1265 "scanner.c"
 }
 
 
 static void value_scan_page_info_free_value (GValue* value) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (value->data[0].v_pointer);
 #line 1274 "scanner.c"
 	}
@@ -1276,13 +1276,13 @@ static void value_scan_page_info_free_value (GValue* value) {
 
 
 static void value_scan_page_info_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_page_info_ref (src_value->data[0].v_pointer);
 #line 1284 "scanner.c"
 	} else {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 1288 "scanner.c"
 	}
@@ -1290,37 +1290,37 @@ static void value_scan_page_info_copy_value (const GValue* src_value, GValue* de
 
 
 static gpointer value_scan_page_info_peek_pointer (const GValue* value) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 1296 "scanner.c"
 }
 
 
 static gchar* value_scan_page_info_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 1303 "scanner.c"
 		ScanPageInfo* object;
 		object = collect_values[0].v_pointer;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 1310 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.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 1314 "scanner.c"
 		}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_page_info_ref (object);
 #line 1318 "scanner.c"
 	} else {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1322 "scanner.c"
 	}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 1326 "scanner.c"
 }
@@ -1329,27 +1329,27 @@ static gchar* value_scan_page_info_collect_value (GValue* value, guint n_collect
 static gchar* value_scan_page_info_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ScanPageInfo** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 1337 "scanner.c"
 	}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 1343 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 1347 "scanner.c"
 	} else {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_page_info_ref (value->data[0].v_pointer);
 #line 1351 "scanner.c"
 	}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 1355 "scanner.c"
 }
@@ -1357,22 +1357,22 @@ static gchar* value_scan_page_info_lcopy_value (const GValue* value, guint n_col
 
 GParamSpec* param_spec_scan_page_info (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanPageInfo* spec;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCAN_PAGE_INFO), NULL);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 1369 "scanner.c"
 }
 
 
 gpointer value_get_scan_page_info (const GValue* value) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_PAGE_INFO), NULL);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 1378 "scanner.c"
 }
@@ -1380,29 +1380,29 @@ gpointer value_get_scan_page_info (const GValue* value) {
 
 void value_set_scan_page_info (GValue* value, gpointer v_object) {
 	ScanPageInfo* old;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_PAGE_INFO));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_PAGE_INFO));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_ref (value->data[0].v_pointer);
 #line 1398 "scanner.c"
 	} else {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1402 "scanner.c"
 	}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (old);
 #line 1408 "scanner.c"
 	}
@@ -1411,27 +1411,27 @@ void value_set_scan_page_info (GValue* value, gpointer v_object) {
 
 void value_take_scan_page_info (GValue* value, gpointer v_object) {
 	ScanPageInfo* old;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_PAGE_INFO));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_PAGE_INFO));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 1427 "scanner.c"
 	} else {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1431 "scanner.c"
 	}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (old);
 #line 1437 "scanner.c"
 	}
@@ -1439,16 +1439,16 @@ void value_take_scan_page_info (GValue* value, gpointer v_object) {
 
 
 static void scan_page_info_class_init (ScanPageInfoClass * klass) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_page_info_parent_class = g_type_class_peek_parent (klass);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((ScanPageInfoClass *) klass)->finalize = scan_page_info_finalize;
 #line 1447 "scanner.c"
 }
 
 
 static void scan_page_info_instance_init (ScanPageInfo * self) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 1454 "scanner.c"
 }
@@ -1456,11 +1456,11 @@ static void scan_page_info_instance_init (ScanPageInfo * self) {
 
 static void scan_page_info_finalize (ScanPageInfo* obj) {
 	ScanPageInfo * self;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_PAGE_INFO, ScanPageInfo);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
-#line 36 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->device);
 #line 1466 "scanner.c"
 }
@@ -1483,9 +1483,9 @@ GType scan_page_info_get_type (void) {
 gpointer scan_page_info_ref (gpointer instance) {
 	ScanPageInfo* self;
 	self = instance;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 1491 "scanner.c"
 }
@@ -1494,11 +1494,11 @@ gpointer scan_page_info_ref (gpointer instance) {
 void scan_page_info_unref (gpointer instance) {
 	ScanPageInfo* self;
 	self = instance;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCAN_PAGE_INFO_GET_CLASS (self)->finalize (self);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 1504 "scanner.c"
 	}
@@ -1507,32 +1507,32 @@ void scan_page_info_unref (gpointer instance) {
 
 ScanLine* scan_line_construct (GType object_type) {
 	ScanLine* self = NULL;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (ScanLine*) g_type_create_instance (object_type);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 1515 "scanner.c"
 }
 
 
 ScanLine* scan_line_new (void) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_line_construct (TYPE_SCAN_LINE);
 #line 1522 "scanner.c"
 }
 
 
 static void value_scan_line_init (GValue* value) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 1529 "scanner.c"
 }
 
 
 static void value_scan_line_free_value (GValue* value) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (value->data[0].v_pointer);
 #line 1538 "scanner.c"
 	}
@@ -1540,13 +1540,13 @@ static void value_scan_line_free_value (GValue* value) {
 
 
 static void value_scan_line_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_line_ref (src_value->data[0].v_pointer);
 #line 1548 "scanner.c"
 	} else {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 1552 "scanner.c"
 	}
@@ -1554,37 +1554,37 @@ static void value_scan_line_copy_value (const GValue* src_value, GValue* dest_va
 
 
 static gpointer value_scan_line_peek_pointer (const GValue* value) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 1560 "scanner.c"
 }
 
 
 static gchar* value_scan_line_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 1567 "scanner.c"
 		ScanLine* object;
 		object = collect_values[0].v_pointer;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 1574 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.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 1578 "scanner.c"
 		}
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_line_ref (object);
 #line 1582 "scanner.c"
 	} else {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1586 "scanner.c"
 	}
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 1590 "scanner.c"
 }
@@ -1593,27 +1593,27 @@ static gchar* value_scan_line_collect_value (GValue* value, guint n_collect_valu
 static gchar* value_scan_line_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ScanLine** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 1601 "scanner.c"
 	}
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 1607 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 1611 "scanner.c"
 	} else {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_line_ref (value->data[0].v_pointer);
 #line 1615 "scanner.c"
 	}
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 1619 "scanner.c"
 }
@@ -1621,22 +1621,22 @@ static gchar* value_scan_line_lcopy_value (const GValue* value, guint n_collect_
 
 GParamSpec* param_spec_scan_line (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanLine* spec;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCAN_LINE), NULL);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 1633 "scanner.c"
 }
 
 
 gpointer value_get_scan_line (const GValue* value) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_LINE), NULL);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 1642 "scanner.c"
 }
@@ -1644,29 +1644,29 @@ gpointer value_get_scan_line (const GValue* value) {
 
 void value_set_scan_line (GValue* value, gpointer v_object) {
 	ScanLine* old;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_LINE));
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_LINE));
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_ref (value->data[0].v_pointer);
 #line 1662 "scanner.c"
 	} else {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1666 "scanner.c"
 	}
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (old);
 #line 1672 "scanner.c"
 	}
@@ -1675,27 +1675,27 @@ void value_set_scan_line (GValue* value, gpointer v_object) {
 
 void value_take_scan_line (GValue* value, gpointer v_object) {
 	ScanLine* old;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_LINE));
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_LINE));
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 1691 "scanner.c"
 	} else {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1695 "scanner.c"
 	}
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (old);
 #line 1701 "scanner.c"
 	}
@@ -1703,16 +1703,16 @@ void value_take_scan_line (GValue* value, gpointer v_object) {
 
 
 static void scan_line_class_init (ScanLineClass * klass) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_line_parent_class = g_type_class_peek_parent (klass);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((ScanLineClass *) klass)->finalize = scan_line_finalize;
 #line 1711 "scanner.c"
 }
 
 
 static void scan_line_instance_init (ScanLine * self) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 1718 "scanner.c"
 }
@@ -1720,11 +1720,11 @@ static void scan_line_instance_init (ScanLine * self) {
 
 static void scan_line_finalize (ScanLine* obj) {
 	ScanLine * self;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_LINE, ScanLine);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
-#line 55 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 55 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->data = (g_free (self->data), NULL);
 #line 1730 "scanner.c"
 }
@@ -1747,9 +1747,9 @@ GType scan_line_get_type (void) {
 gpointer scan_line_ref (gpointer instance) {
 	ScanLine* self;
 	self = instance;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 1755 "scanner.c"
 }
@@ -1758,11 +1758,11 @@ gpointer scan_line_ref (gpointer instance) {
 void scan_line_unref (gpointer instance) {
 	ScanLine* self;
 	self = instance;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCAN_LINE_GET_CLASS (self)->finalize (self);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 1768 "scanner.c"
 	}
@@ -1795,32 +1795,32 @@ GType scan_type_get_type (void) {
 
 ScanOptions* scan_options_construct (GType object_type) {
 	ScanOptions* self = NULL;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (ScanOptions*) g_type_create_instance (object_type);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 1803 "scanner.c"
 }
 
 
 ScanOptions* scan_options_new (void) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_options_construct (TYPE_SCAN_OPTIONS);
 #line 1810 "scanner.c"
 }
 
 
 static void value_scan_options_init (GValue* value) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 1817 "scanner.c"
 }
 
 
 static void value_scan_options_free_value (GValue* value) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (value->data[0].v_pointer);
 #line 1826 "scanner.c"
 	}
@@ -1828,13 +1828,13 @@ static void value_scan_options_free_value (GValue* value) {
 
 
 static void value_scan_options_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_options_ref (src_value->data[0].v_pointer);
 #line 1836 "scanner.c"
 	} else {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 1840 "scanner.c"
 	}
@@ -1842,37 +1842,37 @@ static void value_scan_options_copy_value (const GValue* src_value, GValue* dest
 
 
 static gpointer value_scan_options_peek_pointer (const GValue* value) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 1848 "scanner.c"
 }
 
 
 static gchar* value_scan_options_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 1855 "scanner.c"
 		ScanOptions* object;
 		object = collect_values[0].v_pointer;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 1862 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.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 1866 "scanner.c"
 		}
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_options_ref (object);
 #line 1870 "scanner.c"
 	} else {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1874 "scanner.c"
 	}
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 1878 "scanner.c"
 }
@@ -1881,27 +1881,27 @@ static gchar* value_scan_options_collect_value (GValue* value, guint n_collect_v
 static gchar* value_scan_options_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ScanOptions** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 1889 "scanner.c"
 	}
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 1895 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 1899 "scanner.c"
 	} else {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_options_ref (value->data[0].v_pointer);
 #line 1903 "scanner.c"
 	}
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 1907 "scanner.c"
 }
@@ -1909,22 +1909,22 @@ static gchar* value_scan_options_lcopy_value (const GValue* value, guint n_colle
 
 GParamSpec* param_spec_scan_options (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanOptions* spec;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCAN_OPTIONS), NULL);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 1921 "scanner.c"
 }
 
 
 gpointer value_get_scan_options (const GValue* value) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_OPTIONS), NULL);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 1930 "scanner.c"
 }
@@ -1932,29 +1932,29 @@ gpointer value_get_scan_options (const GValue* value) {
 
 void value_set_scan_options (GValue* value, gpointer v_object) {
 	ScanOptions* old;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_OPTIONS));
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_OPTIONS));
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_ref (value->data[0].v_pointer);
 #line 1950 "scanner.c"
 	} else {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1954 "scanner.c"
 	}
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (old);
 #line 1960 "scanner.c"
 	}
@@ -1963,27 +1963,27 @@ void value_set_scan_options (GValue* value, gpointer v_object) {
 
 void value_take_scan_options (GValue* value, gpointer v_object) {
 	ScanOptions* old;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_OPTIONS));
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_OPTIONS));
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 1979 "scanner.c"
 	} else {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1983 "scanner.c"
 	}
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (old);
 #line 1989 "scanner.c"
 	}
@@ -1991,16 +1991,16 @@ void value_take_scan_options (GValue* value, gpointer v_object) {
 
 
 static void scan_options_class_init (ScanOptionsClass * klass) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_options_parent_class = g_type_class_peek_parent (klass);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((ScanOptionsClass *) klass)->finalize = scan_options_finalize;
 #line 1999 "scanner.c"
 }
 
 
 static void scan_options_instance_init (ScanOptions * self) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 2006 "scanner.c"
 }
@@ -2008,9 +2008,9 @@ static void scan_options_instance_init (ScanOptions * self) {
 
 static void scan_options_finalize (ScanOptions* obj) {
 	ScanOptions * self;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_OPTIONS, ScanOptions);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
 #line 2016 "scanner.c"
 }
@@ -2033,9 +2033,9 @@ GType scan_options_get_type (void) {
 gpointer scan_options_ref (gpointer instance) {
 	ScanOptions* self;
 	self = instance;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 2041 "scanner.c"
 }
@@ -2044,11 +2044,11 @@ gpointer scan_options_ref (gpointer instance) {
 void scan_options_unref (gpointer instance) {
 	ScanOptions* self;
 	self = instance;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCAN_OPTIONS_GET_CLASS (self)->finalize (self);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 2054 "scanner.c"
 	}
@@ -2057,32 +2057,32 @@ void scan_options_unref (gpointer instance) {
 
 ScanJob* scan_job_construct (GType object_type) {
 	ScanJob* self = NULL;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (ScanJob*) g_type_create_instance (object_type);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 2065 "scanner.c"
 }
 
 
 ScanJob* scan_job_new (void) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_job_construct (TYPE_SCAN_JOB);
 #line 2072 "scanner.c"
 }
 
 
 static void value_scan_job_init (GValue* value) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 2079 "scanner.c"
 }
 
 
 static void value_scan_job_free_value (GValue* value) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (value->data[0].v_pointer);
 #line 2088 "scanner.c"
 	}
@@ -2090,13 +2090,13 @@ static void value_scan_job_free_value (GValue* value) {
 
 
 static void value_scan_job_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_job_ref (src_value->data[0].v_pointer);
 #line 2098 "scanner.c"
 	} else {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 2102 "scanner.c"
 	}
@@ -2104,37 +2104,37 @@ static void value_scan_job_copy_value (const GValue* src_value, GValue* dest_val
 
 
 static gpointer value_scan_job_peek_pointer (const GValue* value) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 2110 "scanner.c"
 }
 
 
 static gchar* value_scan_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 2117 "scanner.c"
 		ScanJob* object;
 		object = collect_values[0].v_pointer;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 2124 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.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 2128 "scanner.c"
 		}
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_job_ref (object);
 #line 2132 "scanner.c"
 	} else {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2136 "scanner.c"
 	}
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 2140 "scanner.c"
 }
@@ -2143,27 +2143,27 @@ static gchar* value_scan_job_collect_value (GValue* value, guint n_collect_value
 static gchar* value_scan_job_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ScanJob** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 2151 "scanner.c"
 	}
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 2157 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 2161 "scanner.c"
 	} else {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_job_ref (value->data[0].v_pointer);
 #line 2165 "scanner.c"
 	}
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 2169 "scanner.c"
 }
@@ -2171,22 +2171,22 @@ static gchar* value_scan_job_lcopy_value (const GValue* value, guint n_collect_v
 
 GParamSpec* param_spec_scan_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanJob* spec;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCAN_JOB), NULL);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 2183 "scanner.c"
 }
 
 
 gpointer value_get_scan_job (const GValue* value) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_JOB), NULL);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 2192 "scanner.c"
 }
@@ -2194,29 +2194,29 @@ gpointer value_get_scan_job (const GValue* value) {
 
 void value_set_scan_job (GValue* value, gpointer v_object) {
 	ScanJob* old;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_JOB));
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_JOB));
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_ref (value->data[0].v_pointer);
 #line 2212 "scanner.c"
 	} else {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2216 "scanner.c"
 	}
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (old);
 #line 2222 "scanner.c"
 	}
@@ -2225,27 +2225,27 @@ void value_set_scan_job (GValue* value, gpointer v_object) {
 
 void value_take_scan_job (GValue* value, gpointer v_object) {
 	ScanJob* old;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_JOB));
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_JOB));
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 2241 "scanner.c"
 	} else {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2245 "scanner.c"
 	}
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (old);
 #line 2251 "scanner.c"
 	}
@@ -2253,16 +2253,16 @@ void value_take_scan_job (GValue* value, gpointer v_object) {
 
 
 static void scan_job_class_init (ScanJobClass * klass) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_job_parent_class = g_type_class_peek_parent (klass);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((ScanJobClass *) klass)->finalize = scan_job_finalize;
 #line 2261 "scanner.c"
 }
 
 
 static void scan_job_instance_init (ScanJob * self) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 2268 "scanner.c"
 }
@@ -2270,11 +2270,11 @@ static void scan_job_instance_init (ScanJob * self) {
 
 static void scan_job_finalize (ScanJob* obj) {
 	ScanJob * self;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_JOB, ScanJob);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
-#line 90 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->device);
 #line 2280 "scanner.c"
 }
@@ -2297,9 +2297,9 @@ GType scan_job_get_type (void) {
 gpointer scan_job_ref (gpointer instance) {
 	ScanJob* self;
 	self = instance;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 2305 "scanner.c"
 }
@@ -2308,11 +2308,11 @@ gpointer scan_job_ref (gpointer instance) {
 void scan_job_unref (gpointer instance) {
 	ScanJob* self;
 	self = instance;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCAN_JOB_GET_CLASS (self)->finalize (self);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 2318 "scanner.c"
 	}
@@ -2321,32 +2321,32 @@ void scan_job_unref (gpointer instance) {
 
 Request* request_construct (GType object_type) {
 	Request* self = NULL;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (Request*) g_type_create_instance (object_type);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 2329 "scanner.c"
 }
 
 
 Request* request_new (void) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_construct (TYPE_REQUEST);
 #line 2336 "scanner.c"
 }
 
 
 static void value_request_init (GValue* value) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 2343 "scanner.c"
 }
 
 
 static void value_request_free_value (GValue* value) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (value->data[0].v_pointer);
 #line 2352 "scanner.c"
 	}
@@ -2354,13 +2354,13 @@ static void value_request_free_value (GValue* value) {
 
 
 static void value_request_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = request_ref (src_value->data[0].v_pointer);
 #line 2362 "scanner.c"
 	} else {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 2366 "scanner.c"
 	}
@@ -2368,37 +2368,37 @@ static void value_request_copy_value (const GValue* src_value, GValue* dest_valu
 
 
 static gpointer value_request_peek_pointer (const GValue* value) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 2374 "scanner.c"
 }
 
 
 static gchar* value_request_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 2381 "scanner.c"
 		Request* object;
 		object = collect_values[0].v_pointer;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 2388 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.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 2392 "scanner.c"
 		}
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = request_ref (object);
 #line 2396 "scanner.c"
 	} else {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2400 "scanner.c"
 	}
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 2404 "scanner.c"
 }
@@ -2407,27 +2407,27 @@ static gchar* value_request_collect_value (GValue* value, guint n_collect_values
 static gchar* value_request_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	Request** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 2415 "scanner.c"
 	}
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 2421 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 2425 "scanner.c"
 	} else {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = request_ref (value->data[0].v_pointer);
 #line 2429 "scanner.c"
 	}
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 2433 "scanner.c"
 }
@@ -2435,22 +2435,22 @@ static gchar* value_request_lcopy_value (const GValue* value, guint n_collect_va
 
 GParamSpec* param_spec_request (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecRequest* spec;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_REQUEST), NULL);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 2447 "scanner.c"
 }
 
 
 gpointer value_get_request (const GValue* value) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_REQUEST), NULL);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 2456 "scanner.c"
 }
@@ -2458,29 +2458,29 @@ gpointer value_get_request (const GValue* value) {
 
 void value_set_request (GValue* value, gpointer v_object) {
 	Request* old;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_REQUEST));
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_REQUEST));
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_ref (value->data[0].v_pointer);
 #line 2476 "scanner.c"
 	} else {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2480 "scanner.c"
 	}
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (old);
 #line 2486 "scanner.c"
 	}
@@ -2489,27 +2489,27 @@ void value_set_request (GValue* value, gpointer v_object) {
 
 void value_take_request (GValue* value, gpointer v_object) {
 	Request* old;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_REQUEST));
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_REQUEST));
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 2505 "scanner.c"
 	} else {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2509 "scanner.c"
 	}
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (old);
 #line 2515 "scanner.c"
 	}
@@ -2517,16 +2517,16 @@ void value_take_request (GValue* value, gpointer v_object) {
 
 
 static void request_class_init (RequestClass * klass) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_parent_class = g_type_class_peek_parent (klass);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((RequestClass *) klass)->finalize = request_finalize;
 #line 2525 "scanner.c"
 }
 
 
 static void request_instance_init (Request * self) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 2532 "scanner.c"
 }
@@ -2534,9 +2534,9 @@ static void request_instance_init (Request * self) {
 
 static void request_finalize (Request* obj) {
 	Request * self;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_REQUEST, Request);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
 #line 2542 "scanner.c"
 }
@@ -2559,9 +2559,9 @@ GType request_get_type (void) {
 gpointer request_ref (gpointer instance) {
 	Request* self;
 	self = instance;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 2567 "scanner.c"
 }
@@ -2570,11 +2570,11 @@ gpointer request_ref (gpointer instance) {
 void request_unref (gpointer instance) {
 	Request* self;
 	self = instance;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		REQUEST_GET_CLASS (self)->finalize (self);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 2580 "scanner.c"
 	}
@@ -2583,23 +2583,23 @@ void request_unref (gpointer instance) {
 
 RequestRedetect* request_redetect_construct (GType object_type) {
 	RequestRedetect* self = NULL;
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (RequestRedetect*) request_construct (object_type);
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 2591 "scanner.c"
 }
 
 
 RequestRedetect* request_redetect_new (void) {
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_redetect_construct (TYPE_REQUEST_REDETECT);
 #line 2598 "scanner.c"
 }
 
 
 static void request_redetect_class_init (RequestRedetectClass * klass) {
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_redetect_parent_class = g_type_class_peek_parent (klass);
 #line 2605 "scanner.c"
 }
@@ -2623,23 +2623,23 @@ GType request_redetect_get_type (void) {
 
 RequestCancel* request_cancel_construct (GType object_type) {
 	RequestCancel* self = NULL;
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (RequestCancel*) request_construct (object_type);
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 2631 "scanner.c"
 }
 
 
 RequestCancel* request_cancel_new (void) {
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_cancel_construct (TYPE_REQUEST_CANCEL);
 #line 2638 "scanner.c"
 }
 
 
 static void request_cancel_class_init (RequestCancelClass * klass) {
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_cancel_parent_class = g_type_class_peek_parent (klass);
 #line 2645 "scanner.c"
 }
@@ -2663,25 +2663,25 @@ GType request_cancel_get_type (void) {
 
 RequestStartScan* request_start_scan_construct (GType object_type) {
 	RequestStartScan* self = NULL;
-#line 107 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (RequestStartScan*) request_construct (object_type);
-#line 107 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 2671 "scanner.c"
 }
 
 
 RequestStartScan* request_start_scan_new (void) {
-#line 107 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_start_scan_construct (TYPE_REQUEST_START_SCAN);
 #line 2678 "scanner.c"
 }
 
 
 static void request_start_scan_class_init (RequestStartScanClass * klass) {
-#line 107 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_start_scan_parent_class = g_type_class_peek_parent (klass);
-#line 107 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((RequestClass *) klass)->finalize = request_start_scan_finalize;
 #line 2687 "scanner.c"
 }
@@ -2693,11 +2693,11 @@ static void request_start_scan_instance_init (RequestStartScan * self) {
 
 static void request_start_scan_finalize (Request* obj) {
 	RequestStartScan * self;
-#line 107 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_REQUEST_START_SCAN, RequestStartScan);
-#line 109 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (self->job);
-#line 107 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	REQUEST_CLASS (request_start_scan_parent_class)->finalize (obj);
 #line 2703 "scanner.c"
 }
@@ -2717,23 +2717,23 @@ GType request_start_scan_get_type (void) {
 
 RequestQuit* request_quit_construct (GType object_type) {
 	RequestQuit* self = NULL;
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (RequestQuit*) request_construct (object_type);
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 2725 "scanner.c"
 }
 
 
 RequestQuit* request_quit_new (void) {
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_quit_construct (TYPE_REQUEST_QUIT);
 #line 2732 "scanner.c"
 }
 
 
 static void request_quit_class_init (RequestQuitClass * klass) {
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_quit_parent_class = g_type_class_peek_parent (klass);
 #line 2739 "scanner.c"
 }
@@ -2757,32 +2757,32 @@ GType request_quit_get_type (void) {
 
 Credentials* credentials_construct (GType object_type) {
 	Credentials* self = NULL;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (Credentials*) g_type_create_instance (object_type);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 2765 "scanner.c"
 }
 
 
 Credentials* credentials_new (void) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return credentials_construct (TYPE_CREDENTIALS);
 #line 2772 "scanner.c"
 }
 
 
 static void value_credentials_init (GValue* value) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 2779 "scanner.c"
 }
 
 
 static void value_credentials_free_value (GValue* value) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (value->data[0].v_pointer);
 #line 2788 "scanner.c"
 	}
@@ -2790,13 +2790,13 @@ static void value_credentials_free_value (GValue* value) {
 
 
 static void value_credentials_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = credentials_ref (src_value->data[0].v_pointer);
 #line 2798 "scanner.c"
 	} else {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 2802 "scanner.c"
 	}
@@ -2804,37 +2804,37 @@ static void value_credentials_copy_value (const GValue* src_value, GValue* dest_
 
 
 static gpointer value_credentials_peek_pointer (const GValue* value) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 2810 "scanner.c"
 }
 
 
 static gchar* value_credentials_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 2817 "scanner.c"
 		Credentials* object;
 		object = collect_values[0].v_pointer;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 2824 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.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 2828 "scanner.c"
 		}
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = credentials_ref (object);
 #line 2832 "scanner.c"
 	} else {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2836 "scanner.c"
 	}
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 2840 "scanner.c"
 }
@@ -2843,27 +2843,27 @@ static gchar* value_credentials_collect_value (GValue* value, guint n_collect_va
 static gchar* value_credentials_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	Credentials** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 2851 "scanner.c"
 	}
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 2857 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 2861 "scanner.c"
 	} else {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = credentials_ref (value->data[0].v_pointer);
 #line 2865 "scanner.c"
 	}
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 2869 "scanner.c"
 }
@@ -2871,22 +2871,22 @@ static gchar* value_credentials_lcopy_value (const GValue* value, guint n_collec
 
 GParamSpec* param_spec_credentials (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecCredentials* spec;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_CREDENTIALS), NULL);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 2883 "scanner.c"
 }
 
 
 gpointer value_get_credentials (const GValue* value) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CREDENTIALS), NULL);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 2892 "scanner.c"
 }
@@ -2894,29 +2894,29 @@ gpointer value_get_credentials (const GValue* value) {
 
 void value_set_credentials (GValue* value, gpointer v_object) {
 	Credentials* old;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CREDENTIALS));
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_CREDENTIALS));
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_ref (value->data[0].v_pointer);
 #line 2912 "scanner.c"
 	} else {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2916 "scanner.c"
 	}
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (old);
 #line 2922 "scanner.c"
 	}
@@ -2925,27 +2925,27 @@ void value_set_credentials (GValue* value, gpointer v_object) {
 
 void value_take_credentials (GValue* value, gpointer v_object) {
 	Credentials* old;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CREDENTIALS));
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_CREDENTIALS));
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 2941 "scanner.c"
 	} else {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2945 "scanner.c"
 	}
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (old);
 #line 2951 "scanner.c"
 	}
@@ -2953,16 +2953,16 @@ void value_take_credentials (GValue* value, gpointer v_object) {
 
 
 static void credentials_class_init (CredentialsClass * klass) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials_parent_class = g_type_class_peek_parent (klass);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((CredentialsClass *) klass)->finalize = credentials_finalize;
 #line 2961 "scanner.c"
 }
 
 
 static void credentials_instance_init (Credentials * self) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 2968 "scanner.c"
 }
@@ -2970,13 +2970,13 @@ static void credentials_instance_init (Credentials * self) {
 
 static void credentials_finalize (Credentials* obj) {
 	Credentials * self;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CREDENTIALS, Credentials);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->username);
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->password);
 #line 2982 "scanner.c"
 }
@@ -2999,9 +2999,9 @@ GType credentials_get_type (void) {
 gpointer credentials_ref (gpointer instance) {
 	Credentials* self;
 	self = instance;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 3007 "scanner.c"
 }
@@ -3010,11 +3010,11 @@ gpointer credentials_ref (gpointer instance) {
 void credentials_unref (gpointer instance) {
 	Credentials* self;
 	self = instance;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		CREDENTIALS_GET_CLASS (self)->finalize (self);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 3020 "scanner.c"
 	}
@@ -3034,16 +3034,16 @@ GType scan_state_get_type (void) {
 
 
 static void notify_real_run (Notify* self, Scanner* scanner) {
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
 #line 3040 "scanner.c"
 }
 
 
 void notify_run (Notify* self, Scanner* scanner) {
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_GET_CLASS (self)->run (self, scanner);
 #line 3049 "scanner.c"
 }
@@ -3051,32 +3051,32 @@ void notify_run (Notify* self, Scanner* scanner) {
 
 Notify* notify_construct (GType object_type) {
 	Notify* self = NULL;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (Notify*) g_type_create_instance (object_type);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3059 "scanner.c"
 }
 
 
 Notify* notify_new (void) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_construct (TYPE_NOTIFY);
 #line 3066 "scanner.c"
 }
 
 
 static void value_notify_init (GValue* value) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 3073 "scanner.c"
 }
 
 
 static void value_notify_free_value (GValue* value) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (value->data[0].v_pointer);
 #line 3082 "scanner.c"
 	}
@@ -3084,13 +3084,13 @@ static void value_notify_free_value (GValue* value) {
 
 
 static void value_notify_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = notify_ref (src_value->data[0].v_pointer);
 #line 3092 "scanner.c"
 	} else {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 3096 "scanner.c"
 	}
@@ -3098,37 +3098,37 @@ static void value_notify_copy_value (const GValue* src_value, GValue* dest_value
 
 
 static gpointer value_notify_peek_pointer (const GValue* value) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 3104 "scanner.c"
 }
 
 
 static gchar* value_notify_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 3111 "scanner.c"
 		Notify* object;
 		object = collect_values[0].v_pointer;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 3118 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.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 3122 "scanner.c"
 		}
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = notify_ref (object);
 #line 3126 "scanner.c"
 	} else {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 3130 "scanner.c"
 	}
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 3134 "scanner.c"
 }
@@ -3137,27 +3137,27 @@ static gchar* value_notify_collect_value (GValue* value, guint n_collect_values,
 static gchar* value_notify_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	Notify** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 3145 "scanner.c"
 	}
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 3151 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 3155 "scanner.c"
 	} else {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = notify_ref (value->data[0].v_pointer);
 #line 3159 "scanner.c"
 	}
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 3163 "scanner.c"
 }
@@ -3165,22 +3165,22 @@ static gchar* value_notify_lcopy_value (const GValue* value, guint n_collect_val
 
 GParamSpec* param_spec_notify (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecNotify* spec;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_NOTIFY), NULL);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 3177 "scanner.c"
 }
 
 
 gpointer value_get_notify (const GValue* value) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFY), NULL);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 3186 "scanner.c"
 }
@@ -3188,29 +3188,29 @@ gpointer value_get_notify (const GValue* value) {
 
 void value_set_notify (GValue* value, gpointer v_object) {
 	Notify* old;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFY));
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_NOTIFY));
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_ref (value->data[0].v_pointer);
 #line 3206 "scanner.c"
 	} else {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 3210 "scanner.c"
 	}
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (old);
 #line 3216 "scanner.c"
 	}
@@ -3219,27 +3219,27 @@ void value_set_notify (GValue* value, gpointer v_object) {
 
 void value_take_notify (GValue* value, gpointer v_object) {
 	Notify* old;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFY));
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_NOTIFY));
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 3235 "scanner.c"
 	} else {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 3239 "scanner.c"
 	}
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (old);
 #line 3245 "scanner.c"
 	}
@@ -3247,18 +3247,18 @@ void value_take_notify (GValue* value, gpointer v_object) {
 
 
 static void notify_class_init (NotifyClass * klass) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_parent_class = g_type_class_peek_parent (klass);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->finalize = notify_finalize;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_real_run;
 #line 3257 "scanner.c"
 }
 
 
 static void notify_instance_init (Notify * self) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 3264 "scanner.c"
 }
@@ -3266,9 +3266,9 @@ static void notify_instance_init (Notify * self) {
 
 static void notify_finalize (Notify* obj) {
 	Notify * self;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY, Notify);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
 #line 3274 "scanner.c"
 }
@@ -3291,9 +3291,9 @@ GType notify_get_type (void) {
 gpointer notify_ref (gpointer instance) {
 	Notify* self;
 	self = instance;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 3299 "scanner.c"
 }
@@ -3302,11 +3302,11 @@ gpointer notify_ref (gpointer instance) {
 void notify_unref (gpointer instance) {
 	Notify* self;
 	self = instance;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		NOTIFY_GET_CLASS (self)->finalize (self);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 3312 "scanner.c"
 	}
@@ -3316,13 +3316,13 @@ void notify_unref (gpointer instance) {
 static void notify_scanning_changed_real_run (Notify* base, Scanner* scanner) {
 	NotifyScanningChanged * self;
 	Scanner* _tmp0_ = NULL;
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyScanningChanged*) base;
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "scanning-changed");
 #line 3328 "scanner.c"
 }
@@ -3330,25 +3330,25 @@ static void notify_scanning_changed_real_run (Notify* base, Scanner* scanner) {
 
 NotifyScanningChanged* notify_scanning_changed_construct (GType object_type) {
 	NotifyScanningChanged* self = NULL;
-#line 136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyScanningChanged*) notify_construct (object_type);
-#line 136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3338 "scanner.c"
 }
 
 
 NotifyScanningChanged* notify_scanning_changed_new (void) {
-#line 136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_scanning_changed_construct (TYPE_NOTIFY_SCANNING_CHANGED);
 #line 3345 "scanner.c"
 }
 
 
 static void notify_scanning_changed_class_init (NotifyScanningChangedClass * klass) {
-#line 136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_scanning_changed_parent_class = g_type_class_peek_parent (klass);
-#line 136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_scanning_changed_real_run;
 #line 3354 "scanner.c"
 }
@@ -3371,16 +3371,16 @@ GType notify_scanning_changed_get_type (void) {
 
 
 static void _scan_device_unref0_ (gpointer var) {
-#line 144 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (scan_device_unref (var), NULL));
 #line 3377 "scanner.c"
 }
 
 
 static void _g_list_free__scan_device_unref0_ (GList* self) {
-#line 144 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_foreach (self, (GFunc) _scan_device_unref0_, NULL);
-#line 144 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_free (self);
 #line 3386 "scanner.c"
 }
@@ -3389,26 +3389,26 @@ static void _g_list_free__scan_device_unref0_ (GList* self) {
 NotifyUpdateDevices* notify_update_devices_construct (GType object_type, GList* devices) {
 	NotifyUpdateDevices* self = NULL;
 	GList* _tmp0_ = NULL;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyUpdateDevices*) notify_construct (object_type);
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = devices;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = NULL;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (self->priv->devices);
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->devices = _tmp0_;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (devices);
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3407 "scanner.c"
 }
 
 
 NotifyUpdateDevices* notify_update_devices_new (GList* devices) {
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_update_devices_construct (TYPE_NOTIFY_UPDATE_DEVICES, devices);
 #line 3414 "scanner.c"
 }
@@ -3418,35 +3418,35 @@ static void notify_update_devices_real_run (Notify* base, Scanner* scanner) {
 	NotifyUpdateDevices * self;
 	Scanner* _tmp0_ = NULL;
 	GList* _tmp1_ = NULL;
-#line 145 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyUpdateDevices*) base;
-#line 145 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 145 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
-#line 145 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->devices;
-#line 145 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "update-devices", _tmp1_);
 #line 3432 "scanner.c"
 }
 
 
 static void notify_update_devices_class_init (NotifyUpdateDevicesClass * klass) {
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_update_devices_parent_class = g_type_class_peek_parent (klass);
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->finalize = notify_update_devices_finalize;
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyUpdateDevicesPrivate));
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_update_devices_real_run;
 #line 3445 "scanner.c"
 }
 
 
 static void notify_update_devices_instance_init (NotifyUpdateDevices * self) {
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_UPDATE_DEVICES_GET_PRIVATE (self);
 #line 3452 "scanner.c"
 }
@@ -3454,11 +3454,11 @@ static void notify_update_devices_instance_init (NotifyUpdateDevices * self) {
 
 static void notify_update_devices_finalize (Notify* obj) {
 	NotifyUpdateDevices * self;
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_UPDATE_DEVICES, NotifyUpdateDevices);
-#line 144 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (self->priv->devices);
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_update_devices_parent_class)->finalize (obj);
 #line 3464 "scanner.c"
 }
@@ -3480,26 +3480,26 @@ NotifyRequestAuthorization* notify_request_authorization_construct (GType object
 	NotifyRequestAuthorization* self = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (resource != NULL, NULL);
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyRequestAuthorization*) notify_construct (object_type);
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = resource;
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->resource);
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->resource = _tmp1_;
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3498 "scanner.c"
 }
 
 
 NotifyRequestAuthorization* notify_request_authorization_new (const gchar* resource) {
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_request_authorization_construct (TYPE_NOTIFY_REQUEST_AUTHORIZATION, resource);
 #line 3505 "scanner.c"
 }
@@ -3509,35 +3509,35 @@ static void notify_request_authorization_real_run (Notify* base, Scanner* scanne
 	NotifyRequestAuthorization * self;
 	Scanner* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 152 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyRequestAuthorization*) base;
-#line 152 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 152 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
-#line 152 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->resource;
-#line 152 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "request-authorization", _tmp1_);
 #line 3523 "scanner.c"
 }
 
 
 static void notify_request_authorization_class_init (NotifyRequestAuthorizationClass * klass) {
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_request_authorization_parent_class = g_type_class_peek_parent (klass);
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->finalize = notify_request_authorization_finalize;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyRequestAuthorizationPrivate));
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_request_authorization_real_run;
 #line 3536 "scanner.c"
 }
 
 
 static void notify_request_authorization_instance_init (NotifyRequestAuthorization * self) {
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_REQUEST_AUTHORIZATION_GET_PRIVATE (self);
 #line 3543 "scanner.c"
 }
@@ -3545,11 +3545,11 @@ static void notify_request_authorization_instance_init (NotifyRequestAuthorizati
 
 static void notify_request_authorization_finalize (Notify* obj) {
 	NotifyRequestAuthorization * self;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_REQUEST_AUTHORIZATION, NotifyRequestAuthorization);
-#line 151 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->resource);
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_request_authorization_parent_class)->finalize (obj);
 #line 3555 "scanner.c"
 }
@@ -3572,30 +3572,30 @@ NotifyScanFailed* notify_scan_failed_construct (GType object_type, gint error_co
 	gint _tmp0_ = 0;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (error_string != NULL, NULL);
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyScanFailed*) notify_construct (object_type);
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = error_code;
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->error_code = _tmp0_;
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = error_string;
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->error_string);
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->error_string = _tmp2_;
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3594 "scanner.c"
 }
 
 
 NotifyScanFailed* notify_scan_failed_new (gint error_code, const gchar* error_string) {
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_scan_failed_construct (TYPE_NOTIFY_SCAN_FAILED, error_code, error_string);
 #line 3601 "scanner.c"
 }
@@ -3606,37 +3606,37 @@ static void notify_scan_failed_real_run (Notify* base, Scanner* scanner) {
 	Scanner* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	const gchar* _tmp2_ = NULL;
-#line 160 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyScanFailed*) base;
-#line 160 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 160 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
-#line 160 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->error_code;
-#line 160 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->error_string;
-#line 160 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "scan-failed", _tmp1_, _tmp2_);
 #line 3622 "scanner.c"
 }
 
 
 static void notify_scan_failed_class_init (NotifyScanFailedClass * klass) {
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_scan_failed_parent_class = g_type_class_peek_parent (klass);
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->finalize = notify_scan_failed_finalize;
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyScanFailedPrivate));
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_scan_failed_real_run;
 #line 3635 "scanner.c"
 }
 
 
 static void notify_scan_failed_instance_init (NotifyScanFailed * self) {
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_SCAN_FAILED_GET_PRIVATE (self);
 #line 3642 "scanner.c"
 }
@@ -3644,11 +3644,11 @@ static void notify_scan_failed_instance_init (NotifyScanFailed * self) {
 
 static void notify_scan_failed_finalize (Notify* obj) {
 	NotifyScanFailed * self;
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_SCAN_FAILED, NotifyScanFailed);
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->error_string);
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_scan_failed_parent_class)->finalize (obj);
 #line 3654 "scanner.c"
 }
@@ -3669,13 +3669,13 @@ GType notify_scan_failed_get_type (void) {
 static void notify_document_done_real_run (Notify* base, Scanner* scanner) {
 	NotifyDocumentDone * self;
 	Scanner* _tmp0_ = NULL;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyDocumentDone*) base;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "document-done");
 #line 3681 "scanner.c"
 }
@@ -3683,25 +3683,25 @@ static void notify_document_done_real_run (Notify* base, Scanner* scanner) {
 
 NotifyDocumentDone* notify_document_done_construct (GType object_type) {
 	NotifyDocumentDone* self = NULL;
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyDocumentDone*) notify_construct (object_type);
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3691 "scanner.c"
 }
 
 
 NotifyDocumentDone* notify_document_done_new (void) {
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_document_done_construct (TYPE_NOTIFY_DOCUMENT_DONE);
 #line 3698 "scanner.c"
 }
 
 
 static void notify_document_done_class_init (NotifyDocumentDoneClass * klass) {
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_document_done_parent_class = g_type_class_peek_parent (klass);
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_document_done_real_run;
 #line 3707 "scanner.c"
 }
@@ -3726,13 +3726,13 @@ GType notify_document_done_get_type (void) {
 static void notify_expect_page_real_run (Notify* base, Scanner* scanner) {
 	NotifyExpectPage * self;
 	Scanner* _tmp0_ = NULL;
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyExpectPage*) base;
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "expect-page");
 #line 3738 "scanner.c"
 }
@@ -3740,25 +3740,25 @@ static void notify_expect_page_real_run (Notify* base, Scanner* scanner) {
 
 NotifyExpectPage* notify_expect_page_construct (GType object_type) {
 	NotifyExpectPage* self = NULL;
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyExpectPage*) notify_construct (object_type);
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3748 "scanner.c"
 }
 
 
 NotifyExpectPage* notify_expect_page_new (void) {
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_expect_page_construct (TYPE_NOTIFY_EXPECT_PAGE);
 #line 3755 "scanner.c"
 }
 
 
 static void notify_expect_page_class_init (NotifyExpectPageClass * klass) {
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_expect_page_parent_class = g_type_class_peek_parent (klass);
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_expect_page_real_run;
 #line 3764 "scanner.c"
 }
@@ -3781,7 +3781,7 @@ GType notify_expect_page_get_type (void) {
 
 
 static gpointer _scan_page_info_ref0 (gpointer self) {
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_page_info_ref (self) : NULL;
 #line 3787 "scanner.c"
 }
@@ -3792,30 +3792,30 @@ NotifyGotPageInfo* notify_got_page_info_construct (GType object_type, gint job_i
 	gint _tmp0_ = 0;
 	ScanPageInfo* _tmp1_ = NULL;
 	ScanPageInfo* _tmp2_ = NULL;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (info != NULL, NULL);
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotPageInfo*) notify_construct (object_type);
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = job_id;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_id = _tmp0_;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = info;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_page_info_ref0 (_tmp1_);
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_page_info_unref0 (self->priv->info);
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->info = _tmp2_;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3814 "scanner.c"
 }
 
 
 NotifyGotPageInfo* notify_got_page_info_new (gint job_id, ScanPageInfo* info) {
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_got_page_info_construct (TYPE_NOTIFY_GOT_PAGE_INFO, job_id, info);
 #line 3821 "scanner.c"
 }
@@ -3827,46 +3827,46 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 	gint _tmp1_ = 0;
 	Scanner* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
-#line 178 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotPageInfo*) base;
-#line 178 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->job_id;
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner;
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->first_job_id;
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
 #line 3843 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = self->priv->job_id;
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = scanner;
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->job_id;
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
 #line 3855 "scanner.c"
 	} else {
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
 #line 3859 "scanner.c"
 	}
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
 #line 3863 "scanner.c"
 		Scanner* _tmp7_ = NULL;
 		ScanPageInfo* _tmp8_ = NULL;
-#line 181 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = scanner;
-#line 181 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = self->priv->info;
-#line 181 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp7_, "got-page-info", _tmp8_);
 #line 3872 "scanner.c"
 	}
@@ -3874,20 +3874,20 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 
 
 static void notify_got_page_info_class_init (NotifyGotPageInfoClass * klass) {
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_got_page_info_parent_class = g_type_class_peek_parent (klass);
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->finalize = notify_got_page_info_finalize;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyGotPageInfoPrivate));
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_got_page_info_real_run;
 #line 3886 "scanner.c"
 }
 
 
 static void notify_got_page_info_instance_init (NotifyGotPageInfo * self) {
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_GOT_PAGE_INFO_GET_PRIVATE (self);
 #line 3893 "scanner.c"
 }
@@ -3895,11 +3895,11 @@ static void notify_got_page_info_instance_init (NotifyGotPageInfo * self) {
 
 static void notify_got_page_info_finalize (Notify* obj) {
 	NotifyGotPageInfo * self;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_GOT_PAGE_INFO, NotifyGotPageInfo);
-#line 177 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_page_info_unref0 (self->priv->info);
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_got_page_info_parent_class)->finalize (obj);
 #line 3905 "scanner.c"
 }
@@ -3920,20 +3920,20 @@ GType notify_got_page_info_get_type (void) {
 NotifyPageDone* notify_page_done_construct (GType object_type, gint job_id) {
 	NotifyPageDone* self = NULL;
 	gint _tmp0_ = 0;
-#line 187 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyPageDone*) notify_construct (object_type);
-#line 187 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = job_id;
-#line 187 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_id = _tmp0_;
-#line 187 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3932 "scanner.c"
 }
 
 
 NotifyPageDone* notify_page_done_new (gint job_id) {
-#line 187 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_page_done_construct (TYPE_NOTIFY_PAGE_DONE, job_id);
 #line 3939 "scanner.c"
 }
@@ -3945,43 +3945,43 @@ static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 	gint _tmp1_ = 0;
 	Scanner* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
-#line 189 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyPageDone*) base;
-#line 189 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->job_id;
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner;
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->first_job_id;
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
 #line 3961 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = self->priv->job_id;
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = scanner;
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->job_id;
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
 #line 3973 "scanner.c"
 	} else {
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
 #line 3977 "scanner.c"
 	}
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
 #line 3981 "scanner.c"
 		Scanner* _tmp7_ = NULL;
-#line 192 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = scanner;
-#line 192 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp7_, "page-done");
 #line 3987 "scanner.c"
 	}
@@ -3989,20 +3989,20 @@ static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 
 
 static void notify_page_done_class_init (NotifyPageDoneClass * klass) {
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_page_done_parent_class = g_type_class_peek_parent (klass);
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->finalize = notify_page_done_finalize;
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyPageDonePrivate));
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_page_done_real_run;
 #line 4001 "scanner.c"
 }
 
 
 static void notify_page_done_instance_init (NotifyPageDone * self) {
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_PAGE_DONE_GET_PRIVATE (self);
 #line 4008 "scanner.c"
 }
@@ -4010,9 +4010,9 @@ static void notify_page_done_instance_init (NotifyPageDone * self) {
 
 static void notify_page_done_finalize (Notify* obj) {
 	NotifyPageDone * self;
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_PAGE_DONE, NotifyPageDone);
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_page_done_parent_class)->finalize (obj);
 #line 4018 "scanner.c"
 }
@@ -4031,7 +4031,7 @@ GType notify_page_done_get_type (void) {
 
 
 static gpointer _scan_line_ref0 (gpointer self) {
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_line_ref (self) : NULL;
 #line 4037 "scanner.c"
 }
@@ -4042,30 +4042,30 @@ NotifyGotLine* notify_got_line_construct (GType object_type, gint job_id, ScanLi
 	gint _tmp0_ = 0;
 	ScanLine* _tmp1_ = NULL;
 	ScanLine* _tmp2_ = NULL;
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (line != NULL, NULL);
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotLine*) notify_construct (object_type);
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = job_id;
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_id = _tmp0_;
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = line;
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_line_ref0 (_tmp1_);
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_line_unref0 (self->priv->line);
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->line = _tmp2_;
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 4064 "scanner.c"
 }
 
 
 NotifyGotLine* notify_got_line_new (gint job_id, ScanLine* line) {
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_got_line_construct (TYPE_NOTIFY_GOT_LINE, job_id, line);
 #line 4071 "scanner.c"
 }
@@ -4077,46 +4077,46 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 	gint _tmp1_ = 0;
 	Scanner* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
-#line 201 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotLine*) base;
-#line 201 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->job_id;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->first_job_id;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
 #line 4093 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = self->priv->job_id;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = scanner;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->job_id;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
 #line 4105 "scanner.c"
 	} else {
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
 #line 4109 "scanner.c"
 	}
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
 #line 4113 "scanner.c"
 		Scanner* _tmp7_ = NULL;
 		ScanLine* _tmp8_ = NULL;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = scanner;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = self->priv->line;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp7_, "got-line", _tmp8_);
 #line 4122 "scanner.c"
 	}
@@ -4124,20 +4124,20 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 
 
 static void notify_got_line_class_init (NotifyGotLineClass * klass) {
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_got_line_parent_class = g_type_class_peek_parent (klass);
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->finalize = notify_got_line_finalize;
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyGotLinePrivate));
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_got_line_real_run;
 #line 4136 "scanner.c"
 }
 
 
 static void notify_got_line_instance_init (NotifyGotLine * self) {
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_GOT_LINE_GET_PRIVATE (self);
 #line 4143 "scanner.c"
 }
@@ -4145,11 +4145,11 @@ static void notify_got_line_instance_init (NotifyGotLine * self) {
 
 static void notify_got_line_finalize (Notify* obj) {
 	NotifyGotLine * self;
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_GOT_LINE, NotifyGotLine);
-#line 200 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_line_unref0 (self->priv->line);
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_got_line_parent_class)->finalize (obj);
 #line 4155 "scanner.c"
 }
@@ -4168,37 +4168,37 @@ GType notify_got_line_get_type (void) {
 
 
 static void _scan_job_unref0_ (gpointer var) {
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (scan_job_unref (var), NULL));
 #line 4174 "scanner.c"
 }
 
 
 static void _g_list_free__scan_job_unref0_ (GList* self) {
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_foreach (self, (GFunc) _scan_job_unref0_, NULL);
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_free (self);
 #line 4183 "scanner.c"
 }
 
 
 static void _request_unref0_ (gpointer var) {
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (request_unref (var), NULL));
 #line 4190 "scanner.c"
 }
 
 
 static void _notify_unref0_ (gpointer var) {
-#line 274 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (notify_unref (var), NULL));
 #line 4197 "scanner.c"
 }
 
 
 static void _credentials_unref0_ (gpointer var) {
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (credentials_unref (var), NULL));
 #line 4204 "scanner.c"
 }
@@ -4209,41 +4209,41 @@ static Scanner* scanner_construct (GType object_type) {
 	GAsyncQueue* _tmp0_ = NULL;
 	GAsyncQueue* _tmp1_ = NULL;
 	GAsyncQueue* _tmp2_ = NULL;
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (Scanner*) g_type_create_instance (object_type);
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = g_async_queue_new_full (_request_unref0_);
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->request_queue);
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->request_queue = _tmp0_;
-#line 274 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = g_async_queue_new_full (_notify_unref0_);
-#line 274 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->notify_queue);
-#line 274 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->notify_queue = _tmp1_;
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_async_queue_new_full (_credentials_unref0_);
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->authorize_queue);
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->authorize_queue = _tmp2_;
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 4235 "scanner.c"
 }
 
 
 static Scanner* scanner_new (void) {
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scanner_construct (TYPE_SCANNER);
 #line 4242 "scanner.c"
 }
 
 
 static gpointer _scanner_ref0 (gpointer self) {
-#line 282 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scanner_ref (self) : NULL;
 #line 4249 "scanner.c"
 }
@@ -4254,27 +4254,27 @@ Scanner* scanner_get_instance (void) {
 	Scanner* _tmp0_ = NULL;
 	Scanner* _tmp2_ = NULL;
 	Scanner* _tmp3_ = NULL;
-#line 280 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner_scanner_object;
-#line 280 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_ == NULL) {
 #line 4262 "scanner.c"
 		Scanner* _tmp1_ = NULL;
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = scanner_new ();
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scanner_unref0 (scanner_scanner_object);
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_scanner_object = _tmp1_;
 #line 4270 "scanner.c"
 	}
-#line 282 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner_scanner_object;
-#line 282 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _scanner_ref0 (_tmp2_);
-#line 282 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp3_;
-#line 282 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 4280 "scanner.c"
 }
@@ -4285,28 +4285,28 @@ static gboolean scanner_notify_idle_cb (Scanner* self) {
 	Notify* notification = NULL;
 	GAsyncQueue* _tmp0_ = NULL;
 	gpointer _tmp1_ = NULL;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->notify_queue;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = g_async_queue_pop (_tmp0_);
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notification = (Notify*) _tmp1_;
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_run (notification, self);
-#line 289 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = FALSE;
-#line 289 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (notification);
-#line 289 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 4305 "scanner.c"
 }
 
 
 static gpointer _notify_ref0 (gpointer self) {
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? notify_ref (self) : NULL;
 #line 4312 "scanner.c"
 }
@@ -4315,7 +4315,7 @@ static gpointer _notify_ref0 (gpointer self) {
 static gboolean _scanner_notify_idle_cb_gsource_func (gpointer self) {
 	gboolean result;
 	result = scanner_notify_idle_cb ((Scanner*) self);
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 4321 "scanner.c"
 }
@@ -4325,19 +4325,19 @@ static void scanner_notify (Scanner* self, Notify* notification) {
 	GAsyncQueue* _tmp0_ = NULL;
 	Notify* _tmp1_ = NULL;
 	Notify* _tmp2_ = NULL;
-#line 292 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 292 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (notification != NULL);
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->notify_queue;
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = notification;
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _notify_ref0 (_tmp1_);
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp0_, _tmp2_);
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _scanner_notify_idle_cb_gsource_func, scanner_ref (self), scanner_unref);
 #line 4343 "scanner.c"
 }
@@ -4347,69 +4347,69 @@ static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 298 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->scanning;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_) {
 #line 4357 "scanner.c"
 		gboolean _tmp3_ = FALSE;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = is_scanning;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = !_tmp3_;
 #line 4363 "scanner.c"
 	} else {
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = FALSE;
 #line 4367 "scanner.c"
 	}
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_) {
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = TRUE;
 #line 4373 "scanner.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = self->priv->scanning;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (!_tmp5_) {
 #line 4381 "scanner.c"
 			gboolean _tmp6_ = FALSE;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = is_scanning;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = _tmp6_;
 #line 4387 "scanner.c"
 		} else {
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = FALSE;
 #line 4391 "scanner.c"
 		}
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_;
 #line 4395 "scanner.c"
 	}
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
 #line 4399 "scanner.c"
 		gboolean _tmp7_ = FALSE;
 		NotifyScanningChanged* _tmp8_ = NULL;
 		NotifyScanningChanged* _tmp9_ = NULL;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = is_scanning;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->scanning = _tmp7_;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = notify_scanning_changed_new ();
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = _tmp8_;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp9_);
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp9_);
 #line 4415 "scanner.c"
 	}
@@ -4442,35 +4442,35 @@ static gint scanner_get_device_weight (const gchar* device) {
 	gboolean _tmp1_ = FALSE;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 307 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (device != NULL, 0);
-#line 312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = device;
-#line 312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = g_str_has_prefix (_tmp0_, "vfl:");
-#line 312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_) {
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = 2;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
 #line 4458 "scanner.c"
 	}
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = device;
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = string_contains (_tmp2_, "usb");
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp3_) {
-#line 317 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = 0;
-#line 317 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
 #line 4470 "scanner.c"
 	}
-#line 319 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = 1;
-#line 319 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 4476 "scanner.c"
 }
@@ -4494,60 +4494,60 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 	ScanDevice* _tmp13_ = NULL;
 	const gchar* _tmp14_ = NULL;
 	gint _tmp15_ = 0;
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (device1 != NULL, 0);
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (device2 != NULL, 0);
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = device1;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->name;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner_get_device_weight (_tmp1_);
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	weight1 = _tmp2_;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = device2;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->name;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = scanner_get_device_weight (_tmp4_);
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	weight2 = _tmp5_;
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = weight1;
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = weight2;
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != _tmp7_) {
 #line 4524 "scanner.c"
 		gint _tmp8_ = 0;
 		gint _tmp9_ = 0;
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = weight1;
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = weight2;
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = _tmp8_ - _tmp9_;
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
 #line 4535 "scanner.c"
 	}
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = g_strcmp0;
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = device1;
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = _tmp11_->label;
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = device2;
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = _tmp13_->label;
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = _tmp10_ (_tmp12_, _tmp14_);
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp15_;
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 4553 "scanner.c"
 }
@@ -4556,163 +4556,163 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 static gchar* sane_status_to_string (SANE_Status status) {
 	gchar* result = NULL;
 	SANE_Status _tmp0_ = 0;
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	_tmp0_ = status;
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	switch (_tmp0_) {
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_GOOD:
 #line 4566 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 57 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp1_ = g_strdup ("SANE_STATUS_GOOD");
-#line 57 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp1_;
-#line 57 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4575 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_UNSUPPORTED:
 #line 4579 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp2_ = g_strdup ("SANE_STATUS_UNSUPPORTED");
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp2_;
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4588 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_CANCELLED:
 #line 4592 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 61 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp3_ = g_strdup ("SANE_STATUS_CANCELLED");
-#line 61 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp3_;
-#line 61 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4601 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_DEVICE_BUSY:
 #line 4605 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
-#line 63 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp4_ = g_strdup ("SANE_STATUS_DEVICE_BUSY");
-#line 63 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp4_;
-#line 63 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4614 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_INVAL:
 #line 4618 "scanner.c"
 		{
 			gchar* _tmp5_ = NULL;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp5_ = g_strdup ("SANE_STATUS_INVAL");
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp5_;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4627 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_EOF:
 #line 4631 "scanner.c"
 		{
 			gchar* _tmp6_ = NULL;
-#line 67 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp6_ = g_strdup ("SANE_STATUS_EOF");
-#line 67 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp6_;
-#line 67 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4640 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_JAMMED:
 #line 4644 "scanner.c"
 		{
 			gchar* _tmp7_ = NULL;
-#line 69 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp7_ = g_strdup ("SANE_STATUS_JAMMED");
-#line 69 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp7_;
-#line 69 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4653 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_DOCS:
 #line 4657 "scanner.c"
 		{
 			gchar* _tmp8_ = NULL;
-#line 71 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp8_ = g_strdup ("SANE_STATUS_NO_DOCS");
-#line 71 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp8_;
-#line 71 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4666 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_COVER_OPEN:
 #line 4670 "scanner.c"
 		{
 			gchar* _tmp9_ = NULL;
-#line 73 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp9_ = g_strdup ("SANE_STATUS_COVER_OPEN");
-#line 73 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp9_;
-#line 73 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4679 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_IO_ERROR:
 #line 4683 "scanner.c"
 		{
 			gchar* _tmp10_ = NULL;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp10_ = g_strdup ("SANE_STATUS_IO_ERROR");
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp10_;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4692 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_MEM:
 #line 4696 "scanner.c"
 		{
 			gchar* _tmp11_ = NULL;
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp11_ = g_strdup ("SANE_STATUS_NO_MEM");
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp11_;
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4705 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_ACCESS_DENIED:
 #line 4709 "scanner.c"
 		{
 			gchar* _tmp12_ = NULL;
-#line 79 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp12_ = g_strdup ("SANE_STATUS_ACCESS_DENIED");
-#line 79 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp12_;
-#line 79 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4718 "scanner.c"
 		}
@@ -4720,13 +4720,13 @@ static gchar* sane_status_to_string (SANE_Status status) {
 		{
 			SANE_Status _tmp13_ = 0;
 			gchar* _tmp14_ = NULL;
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp13_ = status;
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp14_ = g_strdup_printf ("SANE_STATUS(%d)", (gint) _tmp13_);
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp14_;
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4732 "scanner.c"
 		}
@@ -4855,7 +4855,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 
 
 static gpointer _scan_device_ref0 (gpointer self) {
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_device_ref (self) : NULL;
 #line 4861 "scanner.c"
 }
@@ -4864,7 +4864,7 @@ static gpointer _scan_device_ref0 (gpointer self) {
 static gint _scanner_compare_devices_gcompare_func (gconstpointer a, gconstpointer b) {
 	gint result;
 	result = scanner_compare_devices ((ScanDevice*) a, (ScanDevice*) b);
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 4870 "scanner.c"
 }
@@ -4886,68 +4886,68 @@ static void scanner_do_redetect (Scanner* self) {
 	GList* _tmp63_ = NULL;
 	NotifyUpdateDevices* _tmp64_ = NULL;
 	NotifyUpdateDevices* _tmp65_ = NULL;
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 336 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	device_list = NULL;
-#line 336 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	device_list_length1 = 0;
-#line 336 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_device_list_size_ = device_list_length1;
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = sane_get_devices (&_tmp0_, FALSE);
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	device_list = _tmp0_;
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	device_list_length1 = -1;
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_device_list_size_ = device_list_length1;
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp1_;
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = status;
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = sane_status_to_string (_tmp2_);
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_;
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:338: sane_get_devices () -> %s", _tmp4_);
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp4_);
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = status;
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
 #line 4922 "scanner.c"
 		SANE_Status _tmp6_ = 0;
 		const gchar* _tmp7_ = NULL;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = status;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = sane_strstatus (_tmp6_);
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:341: Unable to get SANE devices: %s", _tmp7_);
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->need_redetect = FALSE;
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_IDLE;
-#line 344 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 4937 "scanner.c"
 	}
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = NULL;
 #line 4941 "scanner.c"
 	{
 		gint i = 0;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
 #line 4946 "scanner.c"
 		{
 			gboolean _tmp8_ = FALSE;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp8_ = TRUE;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
 #line 4953 "scanner.c"
 				SANE_Device** _tmp10_ = NULL;
@@ -5005,178 +5005,178 @@ static void scanner_do_redetect (Scanner* self) {
 				gchar* _tmp53_ = NULL;
 				ScanDevice* _tmp54_ = NULL;
 				ScanDevice* _tmp55_ = NULL;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp8_) {
 #line 5011 "scanner.c"
 					gint _tmp9_ = 0;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = i;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp9_ + 1;
 #line 5017 "scanner.c"
 				}
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = FALSE;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp10_ = device_list;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp10__length1 = device_list_length1;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp11_ = i;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp12_ = _tmp10_[_tmp11_];
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!(_tmp12_ != NULL)) {
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 5033 "scanner.c"
 				}
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13_ = device_list;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13__length1 = device_list_length1;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp14_ = i;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp15_ = _tmp13_[_tmp14_];
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_ = _tmp15_->name;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp17_ = device_list;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp17__length1 = device_list_length1;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp18_ = i;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp19_ = _tmp17_[_tmp18_];
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp20_ = _tmp19_->vendor;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp21_ = device_list;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp21__length1 = device_list_length1;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22_ = i;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp23_ = _tmp21_[_tmp22_];
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp24_ = _tmp23_->model;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp25_ = device_list;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp25__length1 = device_list_length1;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp26_ = i;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp27_ = _tmp25_[_tmp26_];
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp28_ = _tmp27_->type;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				g_debug ("scanner.vala:350: Device: name=\"%s\" vendor=\"%s\" model=\"%s\" type=" \
 "\"%s\"", _tmp16_, _tmp20_, _tmp24_, _tmp28_);
-#line 353 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp29_ = scan_device_new ();
-#line 353 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scan_device = _tmp29_;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp30_ = scan_device;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp31_ = device_list;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp31__length1 = device_list_length1;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32_ = i;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp33_ = _tmp31_[_tmp32_];
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp34_ = _tmp33_->name;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp35_ = g_strdup (_tmp34_);
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp30_->name);
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp30_->name = _tmp35_;
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp36_ = device_list;
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp36__length1 = device_list_length1;
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp37_ = i;
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp38_ = _tmp36_[_tmp37_];
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp39_ = _tmp38_->vendor;
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp40_ = g_strdup (_tmp39_);
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				vendor = _tmp40_;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp41_ = vendor;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (g_strcmp0 (_tmp41_, "Hewlett-Packard") == 0) {
 #line 5117 "scanner.c"
 					gchar* _tmp42_ = NULL;
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp42_ = g_strdup ("HP");
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_g_free0 (vendor);
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					vendor = _tmp42_;
 #line 5125 "scanner.c"
 				}
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp43_ = scan_device;
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp44_ = vendor;
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp45_ = device_list;
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp45__length1 = device_list_length1;
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp46_ = i;
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp47_ = _tmp45_[_tmp46_];
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp48_ = _tmp47_->model;
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp49_ = g_strdup_printf ("%s %s", _tmp44_, _tmp48_);
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp43_->label);
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp43_->label = _tmp49_;
-#line 363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp50_ = scan_device;
-#line 363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp51_ = _tmp50_->label;
-#line 363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp52_ = string_replace (_tmp51_, "_", " ");
-#line 363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp53_ = _tmp52_;
-#line 363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp53_);
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp54_ = scan_device;
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp55_ = _scan_device_ref0 (_tmp54_);
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				devices = g_list_append (devices, _tmp55_);
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (vendor);
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_scan_device_unref0 (scan_device);
 #line 5167 "scanner.c"
 			}
 		}
 	}
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = g_list_sort (devices, _scanner_compare_devices_gcompare_func);
-#line 371 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->need_redetect = FALSE;
-#line 372 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
-#line 374 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp56_ = devices;
-#line 374 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp56_ != NULL) {
 #line 5181 "scanner.c"
 		ScanDevice* device = NULL;
@@ -5186,47 +5186,47 @@ static void scanner_do_redetect (Scanner* self) {
 		ScanDevice* _tmp60_ = NULL;
 		const gchar* _tmp61_ = NULL;
 		gchar* _tmp62_ = NULL;
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_ = devices;
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp58_ = g_list_nth_data (_tmp57_, (guint) 0);
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_ = _scan_device_ref0 ((ScanDevice*) _tmp58_);
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		device = _tmp59_;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp60_ = device;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp61_ = _tmp60_->name;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp62_ = g_strdup (_tmp61_);
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (self->priv->default_device);
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->default_device = _tmp62_;
-#line 374 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_device_unref0 (device);
 #line 5209 "scanner.c"
 	} else {
-#line 380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (self->priv->default_device);
-#line 380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->default_device = NULL;
 #line 5215 "scanner.c"
 	}
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp63_ = devices;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = NULL;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp64_ = notify_update_devices_new (_tmp63_);
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp65_ = _tmp64_;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp65_);
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp65_);
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (devices);
 #line 5231 "scanner.c"
 }
@@ -5242,27 +5242,27 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 	gboolean _tmp4_ = FALSE;
 	SANE_Option_Descriptor* _tmp5_ = NULL;
 	SANE_Constraint_Type _tmp6_ = 0;
-#line 385 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 385 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, 0);
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = value;
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	v = _tmp0_;
-#line 389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = option;
-#line 389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _tmp1_->type;
-#line 389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = value;
-#line 389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp2_ == SANE_TYPE_INT, _tmp3_);
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = option;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = _tmp5_->constraint_type;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ == SANE_CONSTRAINT_RANGE) {
 #line 5267 "scanner.c"
 		SANE_Option_Descriptor* _tmp7_ = NULL;
@@ -5271,27 +5271,27 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 		SANE_Option_Descriptor* _tmp10_ = NULL;
 		SANE_Range* _tmp11_ = NULL;
 		SANE_Word _tmp12_ = {0};
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = option;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = _tmp7_->constraint.range;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = _tmp8_->max;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = option;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = _tmp10_->constraint.range;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = _tmp11_->min;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = _tmp9_ != _tmp12_;
 #line 5288 "scanner.c"
 	} else {
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = FALSE;
 #line 5292 "scanner.c"
 	}
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_) {
 #line 5296 "scanner.c"
 		gint _tmp13_ = 0;
@@ -5320,74 +5320,74 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 		SANE_Option_Descriptor* _tmp36_ = NULL;
 		SANE_Range* _tmp37_ = NULL;
 		SANE_Word _tmp38_ = {0};
-#line 393 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = v;
-#line 393 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = source_min;
-#line 393 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		v = _tmp13_ - _tmp14_;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = v;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = option;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = _tmp16_->constraint.range;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp18_ = _tmp17_->max;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = option;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp20_ = _tmp19_->constraint.range;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp21_ = _tmp20_->min;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		v = _tmp15_ * ((gint) (_tmp18_ - _tmp21_));
-#line 395 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp22_ = v;
-#line 395 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp23_ = source_max;
-#line 395 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp24_ = source_min;
-#line 395 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		v = _tmp22_ / (_tmp23_ - _tmp24_);
-#line 396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp25_ = v;
-#line 396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp26_ = option;
-#line 396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp27_ = _tmp26_->constraint.range;
-#line 396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp28_ = _tmp27_->min;
-#line 396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		v = _tmp25_ + ((gint) _tmp28_);
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp29_ = value;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp30_ = source_min;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp31_ = source_max;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp32_ = v;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp33_ = option;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = _tmp33_->constraint.range;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp35_ = _tmp34_->min;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp36_ = option;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp37_ = _tmp36_->constraint.range;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp38_ = _tmp37_->max;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:397: scale_int: scaling %d [min: %d, max: %d] to %d [min:" \
 " %d, max: %d]", _tmp29_, _tmp30_, _tmp31_, _tmp32_, (gint) _tmp35_, (gint) _tmp38_);
 #line 5385 "scanner.c"
 	}
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = v;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 5391 "scanner.c"
 }
@@ -5407,68 +5407,68 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 	gchar* _tmp8_ = NULL;
 	SANE_Status _tmp9_ = 0;
 	SANE_Status _tmp14_ = 0;
-#line 404 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 404 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, FALSE);
-#line 407 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
-#line 407 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->cap;
-#line 407 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if ((_tmp1_ & SANE_CAP_AUTOMATIC) == ((SANE_Int) 0)) {
-#line 408 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = FALSE;
-#line 408 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
 #line 5423 "scanner.c"
 	}
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = handle;
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = option_index;
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = sane_control_option (_tmp2_, _tmp3_, SANE_ACTION_SET_AUTO, NULL, NULL);
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp4_;
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = option_index;
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = status;
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = sane_status_to_string (_tmp6_);
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_;
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:411: sane_control_option (%d, SANE_ACTION_SET_AUTO) -> %s", (gint) _tmp5_, _tmp8_);
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp8_);
-#line 412 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = status;
-#line 412 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ != SANE_STATUS_GOOD) {
 #line 5449 "scanner.c"
 		SANE_Option_Descriptor* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		SANE_Status _tmp12_ = 0;
 		const gchar* _tmp13_ = NULL;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = option;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = _tmp10_->name;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = status;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = sane_strstatus (_tmp12_);
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:413: Error setting default option %s: %s", _tmp11_, _tmp13_);
 #line 5464 "scanner.c"
 	}
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = status;
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp14_ == SANE_STATUS_GOOD;
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 5472 "scanner.c"
 }
@@ -5493,72 +5493,72 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	SANE_Status _tmp12_ = 0;
 	gchar* _tmp13_ = NULL;
 	gchar* _tmp14_ = NULL;
-#line 418 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 418 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
-#line 420 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
-#line 420 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->type;
-#line 420 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (_tmp1_ == SANE_TYPE_BOOL);
-#line 422 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = value;
-#line 422 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	v = (SANE_Bool) _tmp2_;
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = handle;
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = option_index;
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = sane_control_option (_tmp3_, _tmp4_, SANE_ACTION_SET_VALUE, &v, NULL);
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp5_;
-#line 424 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = v;
-#line 424 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = (gboolean) _tmp6_;
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = value;
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp8_) {
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = "SANE_TRUE";
 #line 5527 "scanner.c"
 	} else {
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = "SANE_FALSE";
 #line 5531 "scanner.c"
 	}
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = _vala_result;
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp10_) {
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = "SANE_TRUE";
 #line 5539 "scanner.c"
 	} else {
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = "SANE_FALSE";
 #line 5543 "scanner.c"
 	}
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = option_index;
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = status;
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = sane_status_to_string (_tmp12_);
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = _tmp13_;
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:425: sane_control_option (%d, SANE_ACTION_SET_VALUE, %s) " \
 "-> (%s, %s)", (gint) _tmp11_, _tmp7_, _tmp14_, _tmp9_);
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp14_);
-#line 418 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
-#line 418 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
 #line 5561 "scanner.c"
 	}
@@ -5583,25 +5583,25 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 	gchar* _tmp53_ = NULL;
 	SANE_Int _tmp54_ = {0};
 	SANE_Int _tmp55_ = {0};
-#line 428 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 428 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
-#line 430 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
-#line 430 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->type;
-#line 430 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (_tmp1_ == SANE_TYPE_INT);
-#line 432 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = value;
-#line 432 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	v = (SANE_Int) _tmp2_;
-#line 433 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = option;
-#line 433 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->constraint_type;
-#line 433 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_ == SANE_CONSTRAINT_RANGE) {
 #line 5604 "scanner.c"
 		SANE_Option_Descriptor* _tmp5_ = NULL;
@@ -5615,107 +5615,107 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		SANE_Option_Descriptor* _tmp20_ = NULL;
 		SANE_Range* _tmp21_ = NULL;
 		SANE_Word _tmp22_ = {0};
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = option;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->constraint.range;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = _tmp6_->quant;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp7_ != ((SANE_Word) 0)) {
 #line 5624 "scanner.c"
 			SANE_Int _tmp8_ = {0};
 			SANE_Option_Descriptor* _tmp9_ = NULL;
 			SANE_Range* _tmp10_ = NULL;
 			SANE_Word _tmp11_ = {0};
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp8_ = v;
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp9_ = option;
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp10_ = _tmp9_->constraint.range;
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp11_ = _tmp10_->quant;
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp8_ * _tmp11_;
 #line 5639 "scanner.c"
 		}
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = v;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = option;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = _tmp13_->constraint.range;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = _tmp14_->min;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp12_ < ((SANE_Int) _tmp15_)) {
 #line 5651 "scanner.c"
 			SANE_Option_Descriptor* _tmp16_ = NULL;
 			SANE_Range* _tmp17_ = NULL;
 			SANE_Word _tmp18_ = {0};
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp16_ = option;
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = _tmp16_->constraint.range;
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = _tmp17_->min;
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp18_;
 #line 5663 "scanner.c"
 		}
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = v;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp20_ = option;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp21_ = _tmp20_->constraint.range;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp22_ = _tmp21_->max;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp19_ > ((SANE_Int) _tmp22_)) {
 #line 5675 "scanner.c"
 			SANE_Option_Descriptor* _tmp23_ = NULL;
 			SANE_Range* _tmp24_ = NULL;
 			SANE_Word _tmp25_ = {0};
-#line 440 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = option;
-#line 440 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp24_ = _tmp23_->constraint.range;
-#line 440 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = _tmp24_->max;
-#line 440 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp25_;
 #line 5687 "scanner.c"
 		}
 	} else {
 		SANE_Option_Descriptor* _tmp26_ = NULL;
 		SANE_Constraint_Type _tmp27_ = 0;
-#line 442 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp26_ = option;
-#line 442 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp27_ = _tmp26_->constraint_type;
-#line 442 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp27_ == SANE_CONSTRAINT_WORD_LIST) {
 #line 5698 "scanner.c"
 			gint distance = 0;
 			gint nearest = 0;
 			gint _tmp46_ = 0;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			distance = G_MAXINT;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0;
 #line 5706 "scanner.c"
 			{
 				gint i = 0;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
 #line 5711 "scanner.c"
 				{
 					gboolean _tmp28_ = FALSE;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp28_ = TRUE;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
 #line 5718 "scanner.c"
 						gint _tmp30_ = 0;
@@ -5736,117 +5736,117 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 						gint _tmp41_ = 0;
 						gint _tmp42_ = 0;
 						gint _tmp43_ = 0;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp28_) {
 #line 5739 "scanner.c"
 							gint _tmp29_ = 0;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp29_ = i;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp29_ + 1;
 #line 5745 "scanner.c"
 						}
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp28_ = FALSE;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp30_ = i;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp31_ = option;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp32_ = _tmp31_->constraint.word_list;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp32__length1 = -1;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp33_ = _tmp32_[0];
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(((SANE_Word) _tmp30_) < _tmp33_)) {
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
 #line 5763 "scanner.c"
 						}
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp34_ = option;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp35_ = _tmp34_->constraint.word_list;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp35__length1 = -1;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp36_ = i;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp37_ = _tmp35_[_tmp36_ + 1];
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						x = (gint) _tmp37_;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp38_ = x;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp39_ = v;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						d = (gint) (_tmp38_ - _tmp39_);
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp40_ = d;
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp41_ = abs (_tmp40_);
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						d = _tmp41_;
-#line 452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp42_ = d;
-#line 452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp43_ = distance;
-#line 452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp42_ < _tmp43_) {
 #line 5795 "scanner.c"
 							gint _tmp44_ = 0;
 							gint _tmp45_ = 0;
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp44_ = d;
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							distance = _tmp44_;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp45_ = x;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							nearest = _tmp45_;
 #line 5806 "scanner.c"
 						}
 					}
 				}
 			}
-#line 458 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp46_ = nearest;
-#line 458 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp46_;
 #line 5815 "scanner.c"
 		}
 	}
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp47_ = handle;
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp48_ = option_index;
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp49_ = sane_control_option (_tmp47_, _tmp48_, SANE_ACTION_SET_VALUE, &v, NULL);
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp49_;
-#line 462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp50_ = option_index;
-#line 462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp51_ = value;
-#line 462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp52_ = sane_status_to_string (status);
-#line 462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp53_ = _tmp52_;
-#line 462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp54_ = v;
-#line 462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:462: sane_control_option (%d, SANE_ACTION_SET_VALUE, %d) " \
 "-> (%s, %d)", (gint) _tmp50_, _tmp51_, _tmp53_, (gint) _tmp54_);
-#line 462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp53_);
-#line 463 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp55_ = v;
-#line 463 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = (gint) _tmp55_;
-#line 428 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
-#line 428 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
 #line 5848 "scanner.c"
 	}
@@ -5874,25 +5874,25 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 	gchar* _tmp49_ = NULL;
 	gdouble _tmp50_ = 0.0;
 	gdouble _tmp51_ = 0.0;
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
-#line 468 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = value;
-#line 468 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	v = _tmp0_;
-#line 471 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = option;
-#line 471 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _tmp1_->type;
-#line 471 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (_tmp2_ == SANE_TYPE_FIXED);
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = option;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->constraint_type;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_ == SANE_CONSTRAINT_RANGE) {
 #line 5894 "scanner.c"
 		gdouble min = 0.0;
@@ -5909,82 +5909,82 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 		gdouble _tmp14_ = 0.0;
 		gdouble _tmp16_ = 0.0;
 		gdouble _tmp17_ = 0.0;
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = option;
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->constraint.range;
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = _tmp6_->min;
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = SANE_UNFIX ((SANE_Fixed) _tmp7_);
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		min = _tmp8_;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = option;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = _tmp9_->constraint.range;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = _tmp10_->max;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = SANE_UNFIX ((SANE_Fixed) _tmp11_);
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		max = _tmp12_;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = v;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = min;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp13_ < _tmp14_) {
 #line 5935 "scanner.c"
 			gdouble _tmp15_ = 0.0;
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = min;
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp15_;
 #line 5941 "scanner.c"
 		}
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = v;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = max;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp16_ > _tmp17_) {
 #line 5949 "scanner.c"
 			gdouble _tmp18_ = 0.0;
-#line 481 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = max;
-#line 481 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp18_;
 #line 5955 "scanner.c"
 		}
 	} else {
 		SANE_Option_Descriptor* _tmp19_ = NULL;
 		SANE_Constraint_Type _tmp20_ = 0;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = option;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp20_ = _tmp19_->constraint_type;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ == SANE_CONSTRAINT_WORD_LIST) {
 #line 5966 "scanner.c"
 			gdouble distance = 0.0;
 			gdouble nearest = 0.0;
 			gdouble _tmp40_ = 0.0;
-#line 485 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			distance = DBL_MAX;
-#line 485 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0.0;
 #line 5974 "scanner.c"
 			{
 				gint i = 0;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
 #line 5979 "scanner.c"
 				{
 					gboolean _tmp21_ = FALSE;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp21_ = TRUE;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
 #line 5986 "scanner.c"
 						gint _tmp23_ = 0;
@@ -6003,123 +6003,123 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 						gdouble _tmp33_ = 0.0;
 						gdouble _tmp34_ = 0.0;
 						gdouble _tmp35_ = 0.0;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp21_) {
 #line 6005 "scanner.c"
 							gint _tmp22_ = 0;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp22_ = i;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp22_ + 1;
 #line 6011 "scanner.c"
 						}
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp21_ = FALSE;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp23_ = i;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp24_ = option;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp25_ = _tmp24_->constraint.word_list;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp25__length1 = -1;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp26_ = _tmp25_[0];
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(((SANE_Word) _tmp23_) < _tmp26_)) {
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
 #line 6029 "scanner.c"
 						}
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp27_ = option;
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp28_ = _tmp27_->constraint.word_list;
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp28__length1 = -1;
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp29_ = i;
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp30_ = _tmp28_[_tmp29_ + 1];
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp31_ = SANE_UNFIX ((SANE_Fixed) _tmp30_);
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						x = _tmp31_;
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp32_ = x;
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp33_ = v;
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp34_ = fabs (_tmp32_ - _tmp33_);
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp35_ = distance;
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp34_ < _tmp35_) {
 #line 6055 "scanner.c"
 							gdouble _tmp36_ = 0.0;
 							gdouble _tmp37_ = 0.0;
 							gdouble _tmp38_ = 0.0;
 							gdouble _tmp39_ = 0.0;
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp36_ = x;
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp37_ = v;
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp38_ = fabs (_tmp36_ - _tmp37_);
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							distance = _tmp38_;
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp39_ = x;
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							nearest = _tmp39_;
 #line 6072 "scanner.c"
 						}
 					}
 				}
 			}
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp40_ = nearest;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp40_;
 #line 6081 "scanner.c"
 		}
 	}
-#line 500 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = v;
-#line 500 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = SANE_FIX (_tmp41_);
-#line 500 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	v_fixed = _tmp42_;
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = handle;
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = option_index;
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp45_ = sane_control_option (_tmp43_, _tmp44_, SANE_ACTION_SET_VALUE, &v_fixed, NULL);
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp45_;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp46_ = option_index;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp47_ = value;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp48_ = sane_status_to_string (status);
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp49_ = _tmp48_;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp50_ = SANE_UNFIX (v_fixed);
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:502: sane_control_option (%d, SANE_ACTION_SET_VALUE, %f) " \
 "-> (%s, %f)", (gint) _tmp46_, _tmp47_, _tmp49_, _tmp50_);
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp49_);
-#line 504 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp51_ = SANE_UNFIX (v_fixed);
-#line 504 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp51_;
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
 #line 6120 "scanner.c"
 	}
@@ -6130,15 +6130,15 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 	gdouble _vala_result = 0.0;
 	SANE_Option_Descriptor* _tmp0_ = NULL;
 	SANE_Value_Type _tmp1_ = 0;
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
-#line 509 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
-#line 509 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->type;
-#line 509 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SANE_TYPE_FIXED) {
 #line 6139 "scanner.c"
 		SANE_Handle _tmp2_ = {0};
@@ -6146,27 +6146,27 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 		SANE_Int _tmp4_ = {0};
 		gdouble _tmp5_ = 0.0;
 		gdouble _tmp6_ = 0.0;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = handle;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = option;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = option_index;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = value;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_set_fixed_option (self, _tmp2_, _tmp3_, _tmp4_, _tmp5_, &_tmp6_);
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_vala_result = _tmp6_;
 #line 6157 "scanner.c"
 	} else {
 		SANE_Option_Descriptor* _tmp7_ = NULL;
 		SANE_Value_Type _tmp8_ = 0;
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = option;
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = _tmp7_->type;
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp8_ == SANE_TYPE_INT) {
 #line 6167 "scanner.c"
 			gint r = 0;
@@ -6177,36 +6177,36 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 			gdouble _tmp13_ = 0.0;
 			gint _tmp14_ = 0;
 			gint _tmp15_ = 0;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp9_ = handle;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp10_ = option;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp11_ = option_index;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp12_ = value;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp13_ = round (_tmp12_);
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_set_int_option (self, _tmp9_, _tmp10_, _tmp11_, (gint) _tmp13_, &_tmp14_);
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			r = _tmp14_;
-#line 515 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = r;
-#line 515 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_vala_result = (gdouble) _tmp15_;
 #line 6194 "scanner.c"
 		} else {
-#line 519 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_vala_result = 0.0;
-#line 520 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:520: Unable to set unsupported option type");
 #line 6200 "scanner.c"
 		}
 	}
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
 #line 6207 "scanner.c"
 	}
@@ -6226,44 +6226,44 @@ static void scanner_set_option_to_max (Scanner* self, SANE_Handle handle, SANE_O
 	SANE_Status _tmp8_ = 0;
 	gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
-#line 524 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 524 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->constraint_type;
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ != SANE_CONSTRAINT_RANGE) {
-#line 527 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 6237 "scanner.c"
 	}
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = handle;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = option_index;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = option;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_->constraint.range;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = sane_control_option (_tmp2_, _tmp3_, SANE_ACTION_SET_VALUE, &_tmp5_->max, NULL);
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp6_;
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = option_index;
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = status;
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = sane_status_to_string (_tmp8_);
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = _tmp9_;
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:530: sane_control_option (%d, SANE_ACTION_SET_VALUE, opti" \
 "on.range.max) -> (%s)", (gint) _tmp7_, _tmp10_);
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp10_);
 #line 6263 "scanner.c"
 }
@@ -6318,44 +6318,44 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 	gchar* _tmp32_ = NULL;
 	gchar* _tmp33_ = NULL;
 	const gchar* _tmp34_ = NULL;
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, FALSE);
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (value != NULL, FALSE);
-#line 535 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = g_strdup ("");
-#line 535 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_vala_result);
-#line 535 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp0_;
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = option;
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _tmp1_->type;
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp2_ == SANE_TYPE_STRING, FALSE);
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = option;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->size;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = g_new0 (gchar, _tmp4_);
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = _tmp5_;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s_length1 = _tmp4_;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_s_size_ = s_length1;
-#line 540 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	i = 0;
 #line 6348 "scanner.c"
 	{
 		gboolean _tmp6_ = FALSE;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = TRUE;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		while (TRUE) {
 #line 6355 "scanner.c"
 			gboolean _tmp8_ = FALSE;
@@ -6369,131 +6369,131 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 			gint _tmp18_ = 0;
 			gchar _tmp19_ = '\0';
 			gchar _tmp20_ = '\0';
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp6_) {
 #line 6369 "scanner.c"
 				gint _tmp7_ = 0;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = i;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = _tmp7_ + 1;
 #line 6375 "scanner.c"
 			}
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = FALSE;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp9_ = i;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp10_ = option;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp11_ = _tmp10_->size;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (((SANE_Int) _tmp9_) < (_tmp11_ - 1)) {
 #line 6387 "scanner.c"
 				const gchar* _tmp12_ = NULL;
 				gint _tmp13_ = 0;
 				gchar _tmp14_ = '\0';
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp12_ = value;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13_ = i;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp14_ = string_get (_tmp12_, (glong) _tmp13_);
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = _tmp14_ != '\0';
 #line 6399 "scanner.c"
 			} else {
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = FALSE;
 #line 6403 "scanner.c"
 			}
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp8_) {
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 6409 "scanner.c"
 			}
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = s;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15__length1 = s_length1;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp16_ = i;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = value;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = i;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp19_ = string_get (_tmp17_, (glong) _tmp18_);
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_[_tmp16_] = _tmp19_;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = _tmp15_[_tmp16_];
 #line 6427 "scanner.c"
 		}
 	}
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = s;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21__length1 = s_length1;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = i;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_[_tmp22_] = '\0';
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = _tmp21_[_tmp22_];
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = handle;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = option_index;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = s;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26__length1 = s_length1;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = sane_control_option (_tmp24_, _tmp25_, SANE_ACTION_SET_VALUE, _tmp26_, NULL);
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp27_;
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = s;
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28__length1 = s_length1;
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = g_strdup ((const gchar*) _tmp28_);
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_vala_result);
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp29_;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = option_index;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = value;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp32_ = sane_status_to_string (status);
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_ = _tmp32_;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = _vala_result;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:546: sane_control_option (%d, SANE_ACTION_SET_VALUE, \"%s" \
 "\") -> (%s, \"%s\")", (gint) _tmp30_, _tmp31_, _tmp33_, _tmp34_);
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp33_);
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = status == SANE_STATUS_GOOD;
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = (g_free (s), NULL);
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
 #line 6484 "scanner.c"
 	} else {
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
 #line 6488 "scanner.c"
 	}
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 6492 "scanner.c"
 }
@@ -6507,33 +6507,33 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 	SANE_Option_Descriptor* _tmp2_ = NULL;
 	SANE_Constraint_Type _tmp3_ = 0;
 	gchar* _tmp34_ = NULL;
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, FALSE);
-#line 553 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
-#line 553 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->type;
-#line 553 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp1_ == SANE_TYPE_STRING, FALSE);
-#line 554 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = option;
-#line 554 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->constraint_type;
-#line 554 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp3_ == SANE_CONSTRAINT_STRING_LIST, FALSE);
 #line 6520 "scanner.c"
 	{
 		gint i = 0;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
 #line 6525 "scanner.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = TRUE;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
 #line 6532 "scanner.c"
 				gchar** _tmp6_ = NULL;
@@ -6546,40 +6546,40 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 				gint _tmp23__length1 = 0;
 				gint _tmp24_ = 0;
 				const gchar* _tmp25_ = NULL;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp4_) {
 #line 6545 "scanner.c"
 					gint _tmp5_ = 0;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp5_ = i;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp5_ + 1;
 #line 6551 "scanner.c"
 				}
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp4_ = FALSE;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp6_ = values;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp6__length1 = values_length1;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = i;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = _tmp6_[_tmp7_];
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!(_tmp8_ != NULL)) {
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 6567 "scanner.c"
 				}
-#line 558 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				j = 0;
 #line 6571 "scanner.c"
 				{
 					gboolean _tmp9_ = FALSE;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = TRUE;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
 #line 6578 "scanner.c"
 						SANE_Option_Descriptor* _tmp11_ = NULL;
@@ -6596,71 +6596,71 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 						gint _tmp19__length1 = 0;
 						gint _tmp20_ = 0;
 						const gchar* _tmp21_ = NULL;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp9_) {
 #line 6595 "scanner.c"
 							gint _tmp10_ = 0;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp10_ = j;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							j = _tmp10_ + 1;
 #line 6601 "scanner.c"
 						}
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp9_ = FALSE;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp11_ = option;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp12_ = _tmp11_->constraint.string_list;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp12__length1 = -1;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp13_ = j;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp14_ = _tmp12_[_tmp13_];
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(_tmp14_ != NULL)) {
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
 #line 6619 "scanner.c"
 						}
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp15_ = values;
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp15__length1 = values_length1;
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp16_ = i;
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp17_ = _tmp15_[_tmp16_];
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp18_ = option;
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp19_ = _tmp18_->constraint.string_list;
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp19__length1 = -1;
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp20_ = j;
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp21_ = _tmp19_[_tmp20_];
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (g_strcmp0 (_tmp17_, _tmp21_) == 0) {
-#line 562 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
 #line 6643 "scanner.c"
 						}
 					}
 				}
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22_ = option;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp23_ = _tmp22_->constraint.string_list;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp23__length1 = -1;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp24_ = j;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp25_ = _tmp23_[_tmp24_];
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp25_ != NULL) {
 #line 6659 "scanner.c"
 					SANE_Handle _tmp26_ = {0};
@@ -6672,64 +6672,64 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 					const gchar* _tmp31_ = NULL;
 					gchar* _tmp32_ = NULL;
 					gboolean _tmp33_ = FALSE;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp26_ = handle;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp27_ = option;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp28_ = option_index;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp29_ = values;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp29__length1 = values_length1;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp30_ = i;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp31_ = _tmp29_[_tmp30_];
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp33_ = scanner_set_string_option (self, _tmp26_, _tmp27_, _tmp28_, _tmp31_, &_tmp32_);
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_g_free0 (_vala_result);
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_vala_result = _tmp32_;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					result = _tmp33_;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (_result_) {
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						*_result_ = _vala_result;
 #line 6695 "scanner.c"
 					} else {
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (_vala_result);
 #line 6699 "scanner.c"
 					}
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
 #line 6703 "scanner.c"
 				}
 			}
 		}
 	}
-#line 569 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = g_strdup ("");
-#line 569 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_vala_result);
-#line 569 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp34_;
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = FALSE;
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
 #line 6720 "scanner.c"
 	} else {
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
 #line 6724 "scanner.c"
 	}
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 6728 "scanner.c"
 }
@@ -6762,21 +6762,21 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	const gchar* _tmp212_ = NULL;
 	SANE_Option_Descriptor* _tmp213_ = NULL;
 	const gchar* _tmp214_ = NULL;
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
-#line 575 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = index;
-#line 575 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = g_strdup_printf ("Option %d:", (gint) _tmp0_);
-#line 575 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = _tmp1_;
-#line 577 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = option;
-#line 577 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->name;
-#line 577 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp3_, "") != 0) {
 #line 6775 "scanner.c"
 		const gchar* _tmp4_ = NULL;
@@ -6785,31 +6785,31 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = s;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = option;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->name;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = g_strdup_printf (" name='%s'", _tmp6_);
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = _tmp7_;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = g_strconcat (_tmp4_, _tmp8_, NULL);
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (s);
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		s = _tmp9_;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp8_);
 #line 6800 "scanner.c"
 	}
-#line 580 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = option;
-#line 580 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = _tmp10_->title;
-#line 580 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp11_, "") != 0) {
 #line 6808 "scanner.c"
 		const gchar* _tmp12_ = NULL;
@@ -6818,137 +6818,137 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = s;
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = option;
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = _tmp13_->title;
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = g_strdup_printf (" title='%s'", _tmp14_);
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = _tmp15_;
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = g_strconcat (_tmp12_, _tmp16_, NULL);
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (s);
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		s = _tmp17_;
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp16_);
 #line 6833 "scanner.c"
 	}
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = option;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = _tmp18_->type;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp19_) {
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BOOL:
 #line 6843 "scanner.c"
 		{
 			const gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
-#line 586 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = s;
-#line 586 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = g_strconcat (_tmp20_, " type=bool", NULL);
-#line 586 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 586 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp21_;
-#line 587 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 6857 "scanner.c"
 		}
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_INT:
 #line 6861 "scanner.c"
 		{
 			const gchar* _tmp22_ = NULL;
 			gchar* _tmp23_ = NULL;
-#line 589 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = s;
-#line 589 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = g_strconcat (_tmp22_, " type=int", NULL);
-#line 589 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 589 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp23_;
-#line 590 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 6875 "scanner.c"
 		}
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_FIXED:
 #line 6879 "scanner.c"
 		{
 			const gchar* _tmp24_ = NULL;
 			gchar* _tmp25_ = NULL;
-#line 592 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp24_ = s;
-#line 592 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = g_strconcat (_tmp24_, " type=fixed", NULL);
-#line 592 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 592 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp25_;
-#line 593 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 6893 "scanner.c"
 		}
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_STRING:
 #line 6897 "scanner.c"
 		{
 			const gchar* _tmp26_ = NULL;
 			gchar* _tmp27_ = NULL;
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp26_ = s;
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp27_ = g_strconcat (_tmp26_, " type=string", NULL);
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp27_;
-#line 596 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 6911 "scanner.c"
 		}
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BUTTON:
 #line 6915 "scanner.c"
 		{
 			const gchar* _tmp28_ = NULL;
 			gchar* _tmp29_ = NULL;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = s;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_ = g_strconcat (_tmp28_, " type=button", NULL);
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp29_;
-#line 599 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 6929 "scanner.c"
 		}
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_GROUP:
 #line 6933 "scanner.c"
 		{
 			const gchar* _tmp30_ = NULL;
 			gchar* _tmp31_ = NULL;
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp30_ = s;
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp31_ = g_strconcat (_tmp30_, " type=group", NULL);
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp31_;
-#line 602 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 6947 "scanner.c"
 		}
@@ -6960,166 +6960,166 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			gchar* _tmp35_ = NULL;
 			gchar* _tmp36_ = NULL;
 			gchar* _tmp37_ = NULL;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp32_ = s;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp33_ = option;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp34_ = _tmp33_->type;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp35_ = g_strdup_printf (" type=%d", (gint) _tmp34_);
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp36_ = _tmp35_;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_ = g_strconcat (_tmp32_, _tmp36_, NULL);
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp37_;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp36_);
-#line 605 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 6977 "scanner.c"
 		}
 	}
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = s;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = option;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_ = _tmp39_->size;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = g_strdup_printf (" size=%d", (gint) _tmp40_);
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = _tmp41_;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = g_strconcat (_tmp38_, _tmp42_, NULL);
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (s);
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = _tmp43_;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp42_);
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = option;
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp45_ = _tmp44_->unit;
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp45_) {
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_NONE:
 #line 7006 "scanner.c"
 		{
-#line 613 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7010 "scanner.c"
 		}
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PIXEL:
 #line 7014 "scanner.c"
 		{
 			const gchar* _tmp46_ = NULL;
 			gchar* _tmp47_ = NULL;
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp46_ = s;
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp47_ = g_strconcat (_tmp46_, " unit=pixels", NULL);
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp47_;
-#line 616 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7028 "scanner.c"
 		}
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_BIT:
 #line 7032 "scanner.c"
 		{
 			const gchar* _tmp48_ = NULL;
 			gchar* _tmp49_ = NULL;
-#line 618 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp48_ = s;
-#line 618 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp49_ = g_strconcat (_tmp48_, " unit=bits", NULL);
-#line 618 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 618 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp49_;
-#line 619 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7046 "scanner.c"
 		}
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MM:
 #line 7050 "scanner.c"
 		{
 			const gchar* _tmp50_ = NULL;
 			gchar* _tmp51_ = NULL;
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp50_ = s;
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_ = g_strconcat (_tmp50_, " unit=mm", NULL);
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp51_;
-#line 622 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7064 "scanner.c"
 		}
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_DPI:
 #line 7068 "scanner.c"
 		{
 			const gchar* _tmp52_ = NULL;
 			gchar* _tmp53_ = NULL;
-#line 624 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp52_ = s;
-#line 624 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp53_ = g_strconcat (_tmp52_, " unit=dpi", NULL);
-#line 624 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 624 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp53_;
-#line 625 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7082 "scanner.c"
 		}
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PERCENT:
 #line 7086 "scanner.c"
 		{
 			const gchar* _tmp54_ = NULL;
 			gchar* _tmp55_ = NULL;
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_ = s;
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp55_ = g_strconcat (_tmp54_, " unit=percent", NULL);
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp55_;
-#line 628 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7100 "scanner.c"
 		}
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MICROSECOND:
 #line 7104 "scanner.c"
 		{
 			const gchar* _tmp56_ = NULL;
 			gchar* _tmp57_ = NULL;
-#line 630 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp56_ = s;
-#line 630 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp57_ = g_strconcat (_tmp56_, " unit=microseconds", NULL);
-#line 630 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 630 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp57_;
-#line 631 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7118 "scanner.c"
 		}
@@ -7131,46 +7131,46 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			gchar* _tmp61_ = NULL;
 			gchar* _tmp62_ = NULL;
 			gchar* _tmp63_ = NULL;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp58_ = s;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp59_ = option;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp60_ = _tmp59_->unit;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp61_ = g_strdup_printf (" unit=%d", (gint) _tmp60_);
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp62_ = _tmp61_;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp63_ = g_strconcat (_tmp58_, _tmp62_, NULL);
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp63_;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp62_);
-#line 634 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7148 "scanner.c"
 		}
 	}
-#line 637 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp64_ = option;
-#line 637 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp65_ = _tmp64_->constraint_type;
-#line 637 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp65_) {
-#line 637 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_RANGE:
 #line 7159 "scanner.c"
 		{
 			SANE_Option_Descriptor* _tmp66_ = NULL;
 			SANE_Value_Type _tmp67_ = 0;
-#line 640 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp66_ = option;
-#line 640 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp67_ = _tmp66_->type;
-#line 640 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp67_ == SANE_TYPE_FIXED) {
 #line 7169 "scanner.c"
 				const gchar* _tmp68_ = NULL;
@@ -7188,41 +7188,41 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				gchar* _tmp80_ = NULL;
 				gchar* _tmp81_ = NULL;
 				gchar* _tmp82_ = NULL;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp68_ = s;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp69_ = option;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp70_ = _tmp69_->constraint.range;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp71_ = _tmp70_->min;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp72_ = SANE_UNFIX ((SANE_Fixed) _tmp71_);
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp73_ = option;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp74_ = _tmp73_->constraint.range;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp75_ = _tmp74_->max;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp76_ = SANE_UNFIX ((SANE_Fixed) _tmp75_);
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp77_ = option;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp78_ = _tmp77_->constraint.range;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp79_ = _tmp78_->quant;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp80_ = g_strdup_printf (" min=%f, max=%f, quant=%d", _tmp72_, _tmp76_, (gint) _tmp79_);
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp81_ = _tmp80_;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp82_ = g_strconcat (_tmp68_, _tmp81_, NULL);
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp82_;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp81_);
 #line 7221 "scanner.c"
 			} else {
@@ -7239,45 +7239,45 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				gchar* _tmp93_ = NULL;
 				gchar* _tmp94_ = NULL;
 				gchar* _tmp95_ = NULL;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp83_ = s;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp84_ = option;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp85_ = _tmp84_->constraint.range;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp86_ = _tmp85_->min;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp87_ = option;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp88_ = _tmp87_->constraint.range;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp89_ = _tmp88_->max;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp90_ = option;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp91_ = _tmp90_->constraint.range;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp92_ = _tmp91_->quant;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp93_ = g_strdup_printf (" min=%d, max=%d, quant=%d", (gint) _tmp86_, (gint) _tmp89_, (gint) _tmp92_);
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp94_ = _tmp93_;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp95_ = g_strconcat (_tmp83_, _tmp94_, NULL);
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp95_;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp94_);
 #line 7268 "scanner.c"
 			}
-#line 644 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7272 "scanner.c"
 		}
-#line 637 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_WORD_LIST:
 #line 7276 "scanner.c"
 		{
@@ -7285,25 +7285,25 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			gchar* _tmp97_ = NULL;
 			const gchar* _tmp126_ = NULL;
 			gchar* _tmp127_ = NULL;
-#line 646 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp96_ = s;
-#line 646 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp97_ = g_strconcat (_tmp96_, " values=[", NULL);
-#line 646 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 646 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp97_;
 #line 7290 "scanner.c"
 			{
 				gint i = 0;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
 #line 7295 "scanner.c"
 				{
 					gboolean _tmp98_ = FALSE;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp98_ = TRUE;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
 #line 7302 "scanner.c"
 						gint _tmp100_ = 0;
@@ -7314,56 +7314,56 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						gint _tmp104_ = 0;
 						SANE_Option_Descriptor* _tmp107_ = NULL;
 						SANE_Value_Type _tmp108_ = 0;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp98_) {
 #line 7313 "scanner.c"
 							gint _tmp99_ = 0;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp99_ = i;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp99_ + 1;
 #line 7319 "scanner.c"
 						}
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp98_ = FALSE;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp100_ = i;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp101_ = option;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp102_ = _tmp101_->constraint.word_list;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp102__length1 = -1;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp103_ = _tmp102_[0];
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(((SANE_Word) _tmp100_) < _tmp103_)) {
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
 #line 7337 "scanner.c"
 						}
-#line 649 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp104_ = i;
-#line 649 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp104_ != 0) {
 #line 7343 "scanner.c"
 							const gchar* _tmp105_ = NULL;
 							gchar* _tmp106_ = NULL;
-#line 650 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp105_ = s;
-#line 650 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp106_ = g_strconcat (_tmp105_, ", ", NULL);
-#line 650 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
-#line 650 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp106_;
 #line 7354 "scanner.c"
 						}
-#line 651 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp107_ = option;
-#line 651 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp108_ = _tmp107_->type;
-#line 651 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp108_ == SANE_TYPE_INT) {
 #line 7362 "scanner.c"
 							const gchar* _tmp109_ = NULL;
@@ -7375,29 +7375,29 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							gchar* _tmp114_ = NULL;
 							gchar* _tmp115_ = NULL;
 							gchar* _tmp116_ = NULL;
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp109_ = s;
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp110_ = option;
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp111_ = _tmp110_->constraint.word_list;
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp111__length1 = -1;
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp112_ = i;
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp113_ = _tmp111_[_tmp112_ + 1];
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp114_ = g_strdup_printf ("%d", (gint) _tmp113_);
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp115_ = _tmp114_;
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp116_ = g_strconcat (_tmp109_, _tmp115_, NULL);
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp116_;
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (_tmp115_);
 #line 7396 "scanner.c"
 						} else {
@@ -7411,50 +7411,50 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							gchar* _tmp123_ = NULL;
 							gchar* _tmp124_ = NULL;
 							gchar* _tmp125_ = NULL;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp117_ = s;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp118_ = option;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp119_ = _tmp118_->constraint.word_list;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp119__length1 = -1;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp120_ = i;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp121_ = _tmp119_[_tmp120_ + 1];
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp122_ = SANE_UNFIX ((SANE_Fixed) _tmp121_);
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp123_ = g_strdup_printf ("%f", _tmp122_);
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp124_ = _tmp123_;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp125_ = g_strconcat (_tmp117_, _tmp124_, NULL);
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp125_;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (_tmp124_);
 #line 7434 "scanner.c"
 						}
 					}
 				}
 			}
-#line 656 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp126_ = s;
-#line 656 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp127_ = g_strconcat (_tmp126_, "]", NULL);
-#line 656 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 656 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp127_;
-#line 657 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7449 "scanner.c"
 		}
-#line 637 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_STRING_LIST:
 #line 7453 "scanner.c"
 		{
@@ -7462,25 +7462,25 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			gchar* _tmp129_ = NULL;
 			const gchar* _tmp147_ = NULL;
 			gchar* _tmp148_ = NULL;
-#line 659 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp128_ = s;
-#line 659 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp129_ = g_strconcat (_tmp128_, " values=[", NULL);
-#line 659 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 659 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp129_;
 #line 7467 "scanner.c"
 			{
 				gint i = 0;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
 #line 7472 "scanner.c"
 				{
 					gboolean _tmp130_ = FALSE;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp130_ = TRUE;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
 #line 7479 "scanner.c"
 						SANE_Option_Descriptor* _tmp132_ = NULL;
@@ -7498,107 +7498,107 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						gchar* _tmp144_ = NULL;
 						gchar* _tmp145_ = NULL;
 						gchar* _tmp146_ = NULL;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp130_) {
 #line 7497 "scanner.c"
 							gint _tmp131_ = 0;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp131_ = i;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp131_ + 1;
 #line 7503 "scanner.c"
 						}
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp130_ = FALSE;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp132_ = option;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp133_ = _tmp132_->constraint.string_list;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp133__length1 = -1;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp134_ = i;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp135_ = _tmp133_[_tmp134_];
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(_tmp135_ != NULL)) {
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
 #line 7521 "scanner.c"
 						}
-#line 662 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp136_ = i;
-#line 662 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp136_ != 0) {
 #line 7527 "scanner.c"
 							const gchar* _tmp137_ = NULL;
 							gchar* _tmp138_ = NULL;
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp137_ = s;
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp138_ = g_strconcat (_tmp137_, ", ", NULL);
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp138_;
 #line 7538 "scanner.c"
 						}
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp139_ = s;
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp140_ = option;
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp141_ = _tmp140_->constraint.string_list;
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp141__length1 = -1;
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp142_ = i;
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp143_ = _tmp141_[_tmp142_];
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp144_ = g_strdup_printf ("\"%s\"", _tmp143_);
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp145_ = _tmp144_;
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp146_ = g_strconcat (_tmp139_, _tmp145_, NULL);
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (s);
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						s = _tmp146_;
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (_tmp145_);
 #line 7564 "scanner.c"
 					}
 				}
 			}
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp147_ = s;
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp148_ = g_strconcat (_tmp147_, "]", NULL);
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp148_;
-#line 667 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7578 "scanner.c"
 		}
 		default:
 		{
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7584 "scanner.c"
 		}
 	}
-#line 672 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp149_ = option;
-#line 672 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp150_ = _tmp149_->cap;
-#line 672 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	cap = _tmp150_;
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp151_ = cap;
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp151_ != ((SANE_Int) 0)) {
 #line 7597 "scanner.c"
 		const gchar* _tmp152_ = NULL;
@@ -7611,297 +7611,297 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		SANE_Int _tmp189_ = {0};
 		SANE_Int _tmp196_ = {0};
 		SANE_Int _tmp203_ = {0};
-#line 675 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp152_ = s;
-#line 675 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp153_ = g_strconcat (_tmp152_, " cap=", NULL);
-#line 675 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (s);
-#line 675 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		s = _tmp153_;
-#line 676 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp154_ = cap;
-#line 676 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp154_ & SANE_CAP_SOFT_SELECT) != ((SANE_Int) 0)) {
 #line 7620 "scanner.c"
 			const gchar* _tmp155_ = NULL;
 			const gchar* _tmp158_ = NULL;
 			gchar* _tmp159_ = NULL;
 			SANE_Int _tmp160_ = {0};
-#line 678 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp155_ = s;
-#line 678 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp155_, "") != 0) {
 #line 7629 "scanner.c"
 				const gchar* _tmp156_ = NULL;
 				gchar* _tmp157_ = NULL;
-#line 679 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp156_ = s;
-#line 679 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp157_ = g_strconcat (_tmp156_, ",", NULL);
-#line 679 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 679 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp157_;
 #line 7640 "scanner.c"
 			}
-#line 680 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp158_ = s;
-#line 680 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp159_ = g_strconcat (_tmp158_, "soft-select", NULL);
-#line 680 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 680 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp159_;
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp160_ = cap;
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp160_ & (~SANE_CAP_SOFT_SELECT);
 #line 7654 "scanner.c"
 		}
-#line 683 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp161_ = cap;
-#line 683 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp161_ & SANE_CAP_HARD_SELECT) != ((SANE_Int) 0)) {
 #line 7660 "scanner.c"
 			const gchar* _tmp162_ = NULL;
 			const gchar* _tmp165_ = NULL;
 			gchar* _tmp166_ = NULL;
 			SANE_Int _tmp167_ = {0};
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp162_ = s;
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp162_, "") != 0) {
 #line 7669 "scanner.c"
 				const gchar* _tmp163_ = NULL;
 				gchar* _tmp164_ = NULL;
-#line 686 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp163_ = s;
-#line 686 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp164_ = g_strconcat (_tmp163_, ",", NULL);
-#line 686 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 686 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp164_;
 #line 7680 "scanner.c"
 			}
-#line 687 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp165_ = s;
-#line 687 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp166_ = g_strconcat (_tmp165_, "hard-select", NULL);
-#line 687 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 687 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp166_;
-#line 688 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp167_ = cap;
-#line 688 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp167_ & (~SANE_CAP_HARD_SELECT);
 #line 7694 "scanner.c"
 		}
-#line 690 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp168_ = cap;
-#line 690 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp168_ & SANE_CAP_SOFT_DETECT) != ((SANE_Int) 0)) {
 #line 7700 "scanner.c"
 			const gchar* _tmp169_ = NULL;
 			const gchar* _tmp172_ = NULL;
 			gchar* _tmp173_ = NULL;
 			SANE_Int _tmp174_ = {0};
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp169_ = s;
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp169_, "") != 0) {
 #line 7709 "scanner.c"
 				const gchar* _tmp170_ = NULL;
 				gchar* _tmp171_ = NULL;
-#line 693 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp170_ = s;
-#line 693 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp171_ = g_strconcat (_tmp170_, ",", NULL);
-#line 693 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 693 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp171_;
 #line 7720 "scanner.c"
 			}
-#line 694 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp172_ = s;
-#line 694 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp173_ = g_strconcat (_tmp172_, "soft-detect", NULL);
-#line 694 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 694 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp173_;
-#line 695 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp174_ = cap;
-#line 695 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp174_ & (~SANE_CAP_SOFT_DETECT);
 #line 7734 "scanner.c"
 		}
-#line 697 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp175_ = cap;
-#line 697 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp175_ & SANE_CAP_EMULATED) != ((SANE_Int) 0)) {
 #line 7740 "scanner.c"
 			const gchar* _tmp176_ = NULL;
 			const gchar* _tmp179_ = NULL;
 			gchar* _tmp180_ = NULL;
 			SANE_Int _tmp181_ = {0};
-#line 699 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp176_ = s;
-#line 699 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp176_, "") != 0) {
 #line 7749 "scanner.c"
 				const gchar* _tmp177_ = NULL;
 				gchar* _tmp178_ = NULL;
-#line 700 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp177_ = s;
-#line 700 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp178_ = g_strconcat (_tmp177_, ",", NULL);
-#line 700 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 700 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp178_;
 #line 7760 "scanner.c"
 			}
-#line 701 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp179_ = s;
-#line 701 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp180_ = g_strconcat (_tmp179_, "emulated", NULL);
-#line 701 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 701 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp180_;
-#line 702 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp181_ = cap;
-#line 702 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp181_ & (~SANE_CAP_EMULATED);
 #line 7774 "scanner.c"
 		}
-#line 704 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp182_ = cap;
-#line 704 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp182_ & SANE_CAP_AUTOMATIC) != ((SANE_Int) 0)) {
 #line 7780 "scanner.c"
 			const gchar* _tmp183_ = NULL;
 			const gchar* _tmp186_ = NULL;
 			gchar* _tmp187_ = NULL;
 			SANE_Int _tmp188_ = {0};
-#line 706 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp183_ = s;
-#line 706 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp183_, "") != 0) {
 #line 7789 "scanner.c"
 				const gchar* _tmp184_ = NULL;
 				gchar* _tmp185_ = NULL;
-#line 707 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp184_ = s;
-#line 707 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp185_ = g_strconcat (_tmp184_, ",", NULL);
-#line 707 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 707 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp185_;
 #line 7800 "scanner.c"
 			}
-#line 708 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp186_ = s;
-#line 708 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp187_ = g_strconcat (_tmp186_, "automatic", NULL);
-#line 708 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 708 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp187_;
-#line 709 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_ = cap;
-#line 709 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp188_ & (~SANE_CAP_AUTOMATIC);
 #line 7814 "scanner.c"
 		}
-#line 711 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp189_ = cap;
-#line 711 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp189_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
 #line 7820 "scanner.c"
 			const gchar* _tmp190_ = NULL;
 			const gchar* _tmp193_ = NULL;
 			gchar* _tmp194_ = NULL;
 			SANE_Int _tmp195_ = {0};
-#line 713 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp190_ = s;
-#line 713 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp190_, "") != 0) {
 #line 7829 "scanner.c"
 				const gchar* _tmp191_ = NULL;
 				gchar* _tmp192_ = NULL;
-#line 714 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp191_ = s;
-#line 714 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp192_ = g_strconcat (_tmp191_, ",", NULL);
-#line 714 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 714 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp192_;
 #line 7840 "scanner.c"
 			}
-#line 715 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp193_ = s;
-#line 715 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp194_ = g_strconcat (_tmp193_, "inactive", NULL);
-#line 715 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 715 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp194_;
-#line 716 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp195_ = cap;
-#line 716 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp195_ & (~SANE_CAP_INACTIVE);
 #line 7854 "scanner.c"
 		}
-#line 718 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp196_ = cap;
-#line 718 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp196_ & SANE_CAP_ADVANCED) != ((SANE_Int) 0)) {
 #line 7860 "scanner.c"
 			const gchar* _tmp197_ = NULL;
 			const gchar* _tmp200_ = NULL;
 			gchar* _tmp201_ = NULL;
 			SANE_Int _tmp202_ = {0};
-#line 720 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp197_ = s;
-#line 720 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp197_, "") != 0) {
 #line 7869 "scanner.c"
 				const gchar* _tmp198_ = NULL;
 				gchar* _tmp199_ = NULL;
-#line 721 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp198_ = s;
-#line 721 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp199_ = g_strconcat (_tmp198_, ",", NULL);
-#line 721 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 721 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp199_;
 #line 7880 "scanner.c"
 			}
-#line 722 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp200_ = s;
-#line 722 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp201_ = g_strconcat (_tmp200_, "advanced", NULL);
-#line 722 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 722 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp201_;
-#line 723 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp202_ = cap;
-#line 723 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp202_ & (~SANE_CAP_ADVANCED);
 #line 7894 "scanner.c"
 		}
-#line 726 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp203_ = cap;
-#line 726 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp203_ != ((SANE_Int) 0)) {
 #line 7900 "scanner.c"
 			const gchar* _tmp204_ = NULL;
@@ -7910,64 +7910,64 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			gchar* _tmp209_ = NULL;
 			gchar* _tmp210_ = NULL;
 			gchar* _tmp211_ = NULL;
-#line 728 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp204_ = s;
-#line 728 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp204_, "") != 0) {
 #line 7911 "scanner.c"
 				const gchar* _tmp205_ = NULL;
 				gchar* _tmp206_ = NULL;
-#line 729 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp205_ = s;
-#line 729 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp206_ = g_strconcat (_tmp205_, ",", NULL);
-#line 729 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 729 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp206_;
 #line 7922 "scanner.c"
 			}
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp207_ = s;
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp208_ = cap;
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp209_ = g_strdup_printf ("%x", (guint) ((gint) _tmp208_));
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp210_ = _tmp209_;
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp211_ = g_strconcat (_tmp207_, _tmp210_, NULL);
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp211_;
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp210_);
 #line 7940 "scanner.c"
 		}
 	}
-#line 734 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp212_ = s;
-#line 734 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:734: %s", _tmp212_);
-#line 736 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp213_ = option;
-#line 736 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp214_ = _tmp213_->desc;
-#line 736 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp214_ != NULL) {
 #line 7953 "scanner.c"
 		SANE_Option_Descriptor* _tmp215_ = NULL;
 		const gchar* _tmp216_ = NULL;
-#line 737 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp215_ = option;
-#line 737 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp216_ = _tmp215_->desc;
-#line 737 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:737:   Description: %s", _tmp216_);
 #line 7962 "scanner.c"
 	}
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (s);
 #line 7966 "scanner.c"
 }
@@ -7982,39 +7982,39 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 	Scanner* _tmp4_ = NULL;
 	GAsyncQueue* _tmp5_ = NULL;
 	gpointer _tmp6_ = NULL;
-#line 740 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (resource != NULL);
-#line 742 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner_scanner_object;
-#line 742 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = resource;
-#line 742 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = notify_request_authorization_new (_tmp1_);
-#line 742 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_;
-#line 742 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (_tmp0_, (Notify*) _tmp3_);
-#line 742 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp3_);
-#line 744 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = scanner_scanner_object;
-#line 744 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_->priv->authorize_queue;
-#line 744 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = g_async_queue_pop (_tmp5_);
-#line 744 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials = (Credentials*) _tmp6_;
 #line 8001 "scanner.c"
 	{
 		gint i = 0;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
 #line 8006 "scanner.c"
 		{
 			gboolean _tmp7_ = FALSE;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = TRUE;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
 #line 8013 "scanner.c"
 				gboolean _tmp9_ = FALSE;
@@ -8030,66 +8030,66 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				gint _tmp20_ = 0;
 				gchar _tmp21_ = '\0';
 				gchar _tmp22_ = '\0';
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp7_) {
 #line 8029 "scanner.c"
 					gint _tmp8_ = 0;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp8_ = i;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp8_ + 1;
 #line 8035 "scanner.c"
 				}
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = FALSE;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp10_ = credentials;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp11_ = _tmp10_->username;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp12_ = i;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13_ = string_get (_tmp11_, (glong) _tmp12_);
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp13_ != '\0') {
 #line 8049 "scanner.c"
 					gint _tmp14_ = 0;
 					gint _tmp15_ = 0;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp14_ = i;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp15_ = SANE_MAX_USERNAME_LEN;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = _tmp14_ < _tmp15_;
 #line 8058 "scanner.c"
 				} else {
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = FALSE;
 #line 8062 "scanner.c"
 				}
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp9_) {
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 8068 "scanner.c"
 				}
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_ = username;
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16__length1 = username_length1;
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp17_ = i;
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp18_ = credentials;
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp19_ = _tmp18_->username;
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp20_ = i;
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp21_ = string_get (_tmp19_, (glong) _tmp20_);
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_[_tmp17_] = _tmp21_;
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22_ = _tmp16_[_tmp17_];
 #line 8088 "scanner.c"
 			}
@@ -8097,14 +8097,14 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 	}
 	{
 		gint i = 0;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
 #line 8096 "scanner.c"
 		{
 			gboolean _tmp23_ = FALSE;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = TRUE;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
 #line 8103 "scanner.c"
 				gboolean _tmp25_ = FALSE;
@@ -8120,79 +8120,79 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				gint _tmp36_ = 0;
 				gchar _tmp37_ = '\0';
 				gchar _tmp38_ = '\0';
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp23_) {
 #line 8119 "scanner.c"
 					gint _tmp24_ = 0;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp24_ = i;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp24_ + 1;
 #line 8125 "scanner.c"
 				}
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp23_ = FALSE;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp26_ = credentials;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp27_ = _tmp26_->password;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp28_ = i;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp29_ = string_get (_tmp27_, (glong) _tmp28_);
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp29_ != '\0') {
 #line 8139 "scanner.c"
 					gint _tmp30_ = 0;
 					gint _tmp31_ = 0;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp30_ = i;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp31_ = SANE_MAX_USERNAME_LEN;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp25_ = _tmp30_ < _tmp31_;
 #line 8148 "scanner.c"
 				} else {
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp25_ = FALSE;
 #line 8152 "scanner.c"
 				}
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp25_) {
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 8158 "scanner.c"
 				}
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32_ = password;
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32__length1 = password_length1;
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp33_ = i;
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp34_ = credentials;
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp35_ = _tmp34_->password;
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp36_ = i;
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp37_ = string_get (_tmp35_, (glong) _tmp36_);
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32_[_tmp33_] = _tmp37_;
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp38_ = _tmp32_[_tmp33_];
 #line 8178 "scanner.c"
 			}
 		}
 	}
-#line 740 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
 #line 8184 "scanner.c"
 }
 
 
 static gpointer _credentials_ref0 (gpointer self) {
-#line 756 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? credentials_ref (self) : NULL;
 #line 8191 "scanner.c"
 }
@@ -8207,39 +8207,39 @@ void scanner_authorize (Scanner* self, const gchar* username, const gchar* passw
 	gchar* _tmp4_ = NULL;
 	GAsyncQueue* _tmp5_ = NULL;
 	Credentials* _tmp6_ = NULL;
-#line 751 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 751 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (username != NULL);
-#line 751 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (password != NULL);
-#line 753 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = credentials_new ();
-#line 753 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials = _tmp0_;
-#line 754 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = username;
-#line 754 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 754 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (credentials->username);
-#line 754 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials->username = _tmp2_;
-#line 755 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = password;
-#line 755 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 755 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (credentials->password);
-#line 755 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials->password = _tmp4_;
-#line 756 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->authorize_queue;
-#line 756 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = _credentials_ref0 (credentials);
-#line 756 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp5_, _tmp6_);
-#line 751 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
 #line 8238 "scanner.c"
 }
@@ -8247,48 +8247,48 @@ void scanner_authorize (Scanner* self, const gchar* username, const gchar* passw
 
 static void scanner_close_device (Scanner* self) {
 	gboolean _tmp0_ = FALSE;
-#line 759 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 761 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->have_handle;
-#line 761 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
 #line 8250 "scanner.c"
 		SANE_Handle _tmp1_ = {0};
 		SANE_Handle _tmp2_ = {0};
-#line 763 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = self->priv->handle;
-#line 763 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		sane_cancel (_tmp1_);
-#line 764 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 764 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:764: sane_cancel ()");
-#line 766 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = self->priv->handle;
-#line 766 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		sane_close (_tmp2_);
-#line 767 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:767: sane_close ()");
-#line 768 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 768 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->have_handle = FALSE;
-#line 769 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_hash_table_unref0 (self->priv->options);
-#line 769 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->options = NULL;
 #line 8271 "scanner.c"
 	}
-#line 772 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 772 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = NULL;
-#line 772 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer_length1 = 0;
-#line 772 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->_buffer_size_ = self->priv->buffer_length1;
-#line 773 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_job_unref0_0 (self->priv->job_queue);
-#line 773 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_queue = NULL;
-#line 775 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 775 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
 #line 8287 "scanner.c"
 }
@@ -8299,39 +8299,39 @@ static void scanner_fail_scan (Scanner* self, gint error_code, const gchar* erro
 	const gchar* _tmp1_ = NULL;
 	NotifyScanFailed* _tmp2_ = NULL;
 	NotifyScanFailed* _tmp3_ = NULL;
-#line 778 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 778 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (error_string != NULL);
-#line 780 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 780 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_close_device (self);
-#line 781 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = error_code;
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = error_string;
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = notify_scan_failed_new (_tmp0_, _tmp1_);
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_;
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp3_);
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp3_);
 #line 8316 "scanner.c"
 }
 
 
 static gpointer _request_ref0 (gpointer self) {
-#line 807 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? request_ref (self) : NULL;
 #line 8323 "scanner.c"
 }
 
 
 static gpointer _scan_job_ref0 (gpointer self) {
-#line 808 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_job_ref (self) : NULL;
 #line 8330 "scanner.c"
 }
@@ -8342,33 +8342,33 @@ static gboolean scanner_handle_requests (Scanner* self) {
 	gboolean _tmp0_ = FALSE;
 	ScanState _tmp1_ = 0;
 	gint request_count = 0;
-#line 785 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 788 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->state;
-#line 788 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SCAN_STATE_IDLE) {
 #line 8345 "scanner.c"
 		gboolean _tmp2_ = FALSE;
-#line 788 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = self->priv->need_redetect;
-#line 788 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
 #line 8351 "scanner.c"
 	} else {
-#line 788 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
 #line 8355 "scanner.c"
 	}
-#line 788 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 789 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_REDETECT;
 #line 8361 "scanner.c"
 	}
-#line 792 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_count = 0;
-#line 793 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
 #line 8367 "scanner.c"
 		Request* request = NULL;
@@ -8377,70 +8377,70 @@ static gboolean scanner_handle_requests (Scanner* self) {
 		ScanState _tmp5_ = 0;
 		gint _tmp11_ = 0;
 		Request* _tmp12_ = NULL;
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = self->priv->state;
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp5_ == SCAN_STATE_IDLE) {
 #line 8378 "scanner.c"
 			gint _tmp6_ = 0;
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = request_count;
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = _tmp6_ == 0;
 #line 8384 "scanner.c"
 		} else {
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = FALSE;
 #line 8388 "scanner.c"
 		}
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp4_) {
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = TRUE;
 #line 8394 "scanner.c"
 		} else {
 			GAsyncQueue* _tmp7_ = NULL;
 			gint _tmp8_ = 0;
-#line 797 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = self->priv->request_queue;
-#line 797 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp8_ = g_async_queue_length (_tmp7_);
-#line 797 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = _tmp8_ > 0;
 #line 8404 "scanner.c"
 		}
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp3_) {
 #line 8408 "scanner.c"
 			GAsyncQueue* _tmp9_ = NULL;
 			gpointer _tmp10_ = NULL;
-#line 798 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp9_ = self->priv->request_queue;
-#line 798 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp10_ = g_async_queue_pop (_tmp9_);
-#line 798 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (request);
-#line 798 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			request = (Request*) _tmp10_;
 #line 8419 "scanner.c"
 		} else {
-#line 800 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = TRUE;
-#line 800 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (request);
-#line 800 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 8427 "scanner.c"
 		}
-#line 802 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 802 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:802: Processing request");
-#line 803 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = request_count;
-#line 803 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_count = _tmp11_ + 1;
-#line 805 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = request;
-#line 805 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_REQUEST_START_SCAN)) {
 #line 8439 "scanner.c"
 			RequestStartScan* r = NULL;
@@ -8449,51 +8449,51 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			RequestStartScan* _tmp15_ = NULL;
 			ScanJob* _tmp16_ = NULL;
 			ScanJob* _tmp17_ = NULL;
-#line 807 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp13_ = request;
-#line 807 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp14_ = _request_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_REQUEST_START_SCAN, RequestStartScan));
-#line 807 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			r = _tmp14_;
-#line 808 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = r;
-#line 808 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp16_ = _tmp15_->job;
-#line 808 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = _scan_job_ref0 (_tmp16_);
-#line 808 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			self->priv->job_queue = g_list_append (self->priv->job_queue, _tmp17_);
-#line 805 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (r);
 #line 8462 "scanner.c"
 		} else {
 			Request* _tmp18_ = NULL;
-#line 810 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 810 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = request;
-#line 810 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 810 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_REQUEST_CANCEL)) {
-#line 812 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_fail_scan (self, (gint) SANE_STATUS_CANCELLED, "Scan cancelled - do not report this error");
 #line 8471 "scanner.c"
 			} else {
 				Request* _tmp19_ = NULL;
-#line 814 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 814 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp19_ = request;
-#line 814 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 814 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_REQUEST_QUIT)) {
-#line 816 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 816 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_close_device (self);
-#line 817 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					result = FALSE;
-#line 817 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_request_unref0 (request);
-#line 817 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
 #line 8486 "scanner.c"
 				}
 			}
 		}
-#line 793 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_request_unref0 (request);
 #line 8492 "scanner.c"
 	}
@@ -8501,7 +8501,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 
 
 static void _g_free0_ (gpointer var) {
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	var = (g_free (var), NULL);
 #line 8500 "scanner.c"
 }
@@ -8535,199 +8535,199 @@ static void scanner_do_open (Scanner* self) {
 	ScanJob* _tmp35_ = NULL;
 	const gchar* _tmp36_ = NULL;
 	gchar* _tmp37_ = NULL;
-#line 822 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 822 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 824 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 824 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 824 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 824 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 826 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 826 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->line_count = 0;
-#line 827 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 827 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->pass_number = 0;
-#line 828 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->page_number = 0;
-#line 829 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->notified_page = -1;
-#line 830 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 830 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->option_index = (SANE_Int) 0;
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = job;
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_->device;
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ == NULL) {
 #line 8558 "scanner.c"
 		const gchar* _tmp6_ = NULL;
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = self->priv->default_device;
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = _tmp6_ != NULL;
 #line 8564 "scanner.c"
 	} else {
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = FALSE;
 #line 8568 "scanner.c"
 	}
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp3_) {
 #line 8572 "scanner.c"
 		ScanJob* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 833 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = job;
-#line 833 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = self->priv->default_device;
-#line 833 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = g_strdup (_tmp8_);
-#line 833 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp7_->device);
-#line 833 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_->device = _tmp9_;
 #line 8586 "scanner.c"
 	}
-#line 835 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = job;
-#line 835 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = _tmp10_->device;
-#line 835 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp11_ == NULL) {
 #line 8594 "scanner.c"
 		const gchar* _tmp12_ = NULL;
-#line 837 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:837: No scan device available");
-#line 838 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = _ ("No scanners available.  Please connect a scanner.");
-#line 838 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, 0, _tmp12_);
-#line 841 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 841 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 8606 "scanner.c"
 	}
-#line 845 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = self->priv->have_handle;
-#line 845 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp13_) {
 #line 8612 "scanner.c"
 		const gchar* _tmp14_ = NULL;
 		ScanJob* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 		SANE_Handle _tmp17_ = {0};
-#line 847 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = self->priv->current_device;
-#line 847 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = job;
-#line 847 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = _tmp15_->device;
-#line 847 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (g_strcmp0 (_tmp14_, _tmp16_) == 0) {
-#line 849 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			self->priv->state = SCAN_STATE_GET_OPTION;
-#line 850 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_scan_job_unref0 (job);
-#line 850 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return;
 #line 8631 "scanner.c"
 		}
-#line 853 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = self->priv->handle;
-#line 853 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		sane_close (_tmp17_);
-#line 854 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 854 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:854: sane_close ()");
-#line 855 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->have_handle = FALSE;
 #line 8641 "scanner.c"
 	}
-#line 858 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
-#line 858 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->current_device = NULL;
-#line 860 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->have_handle = FALSE;
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = g_str_hash;
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = g_str_equal;
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = g_hash_table_new_full (_tmp18_, _tmp19_, _g_free0_, NULL);
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_hash_table_unref0 (self->priv->options);
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->options = _tmp20_;
-#line 862 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = job;
-#line 862 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = _tmp21_->device;
-#line 862 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = sane_open (_tmp22_, &_tmp23_);
-#line 862 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->handle = _tmp23_;
-#line 862 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp24_;
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = job;
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = _tmp25_->device;
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = status;
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = sane_status_to_string (_tmp27_);
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = _tmp28_;
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:863: sane_open (\"%s\") -> %s", _tmp26_, _tmp29_);
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp29_);
-#line 865 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = status;
-#line 865 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp30_ != SANE_STATUS_GOOD) {
 #line 8687 "scanner.c"
 		SANE_Status _tmp31_ = 0;
 		const gchar* _tmp32_ = NULL;
 		SANE_Status _tmp33_ = 0;
 		const gchar* _tmp34_ = NULL;
-#line 867 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp31_ = status;
-#line 867 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp32_ = sane_strstatus (_tmp31_);
-#line 867 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:867: Unable to get open device: %s", _tmp32_);
-#line 868 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp33_ = status;
-#line 868 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = _ ("Unable to connect to scanner");
-#line 868 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp33_, _tmp34_);
-#line 871 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 871 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 8708 "scanner.c"
 	}
-#line 873 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->have_handle = TRUE;
-#line 875 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = job;
-#line 875 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = _tmp35_->device;
-#line 875 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_ = g_strdup (_tmp36_);
-#line 875 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
-#line 875 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->current_device = _tmp37_;
-#line 876 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_GET_OPTION;
-#line 822 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 822 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
 #line 8726 "scanner.c"
 }
@@ -8760,39 +8760,39 @@ static void scanner_do_get_option (Scanner* self) {
 	const gchar* _tmp366_ = NULL;
 	gchar* _tmp367_ = NULL;
 	SANE_Int _tmp368_ = {0};
-#line 879 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 881 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 881 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 881 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 881 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 883 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = self->priv->handle;
-#line 883 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->option_index;
-#line 883 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = sane_get_option_descriptor (_tmp3_, _tmp4_);
-#line 883 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	option = _tmp5_;
-#line 884 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = self->priv->option_index;
-#line 884 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:884: sane_get_option_descriptor (%d)", (gint) _tmp6_);
-#line 885 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = self->priv->option_index;
-#line 885 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	index = _tmp7_;
-#line 886 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = self->priv->option_index;
-#line 886 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->option_index = _tmp8_ + 1;
-#line 889 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = option;
-#line 889 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ == NULL) {
 #line 8791 "scanner.c"
 		SANE_Handle _tmp10_ = {0};
@@ -8856,40 +8856,40 @@ static void scanner_do_get_option (Scanner* self) {
 		SANE_Option_Descriptor* _tmp308_ = NULL;
 		SANE_Option_Descriptor* _tmp309_ = NULL;
 		const gchar* _tmp320_ = NULL;
-#line 892 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = self->priv->handle;
-#line 892 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = SANE_NAME_SCAN_SOURCE;
-#line 892 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = scanner_get_option_by_name (self, _tmp10_, _tmp11_, &_tmp12_);
-#line 892 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp12_;
-#line 892 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp13_;
-#line 893 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = option;
-#line 893 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp14_ == NULL) {
 #line 8867 "scanner.c"
 			SANE_Handle _tmp15_ = {0};
 			gint _tmp16_ = 0;
 			SANE_Option_Descriptor* _tmp17_ = NULL;
-#line 895 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_debug ("scanner.vala:895: SCAN_SOURCE not available, trying alternative \"doc-" \
 "source\"");
-#line 896 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = self->priv->handle;
-#line 896 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = scanner_get_option_by_name (self, _tmp15_, "doc-source", &_tmp16_);
-#line 896 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp16_;
-#line 896 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp17_;
 #line 8881 "scanner.c"
 		}
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp18_ = option;
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp18_ != NULL) {
 #line 8887 "scanner.c"
 			gchar** flatbed_sources = NULL;
@@ -8945,163 +8945,163 @@ static void scanner_do_get_option (Scanner* self) {
 			gint _adf_duplex_sources_size_ = 0;
 			ScanJob* _tmp55_ = NULL;
 			ScanType _tmp56_ = 0;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp19_ = g_strdup ("Auto");
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = SANE_I18N ("Auto");
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = g_strdup (_tmp20_);
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = g_strdup ("Flatbed");
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = SANE_I18N ("Flatbed");
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp24_ = g_strdup (_tmp23_);
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = g_strdup ("FlatBed");
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp26_ = g_strdup ("Normal");
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp27_ = SANE_I18N ("Normal");
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = g_strdup (_tmp27_);
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_ = g_new0 (gchar*, 7 + 1);
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[0] = _tmp19_;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[1] = _tmp21_;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[2] = _tmp22_;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[3] = _tmp24_;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[4] = _tmp25_;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[5] = _tmp26_;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[6] = _tmp28_;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources = _tmp29_;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources_length1 = 7;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_flatbed_sources_size_ = flatbed_sources_length1;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp30_ = g_strdup ("Automatic Document Feeder");
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp31_ = SANE_I18N ("Automatic Document Feeder");
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp32_ = g_strdup (_tmp31_);
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp33_ = g_strdup ("ADF");
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp34_ = g_strdup ("Automatic Document Feeder(left aligned)");
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp35_ = g_strdup ("Automatic Document Feeder(centrally aligned)");
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp36_ = g_strdup ("ADF Simplex");
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_ = g_new0 (gchar*, 6 + 1);
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[0] = _tmp30_;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[1] = _tmp32_;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[2] = _tmp33_;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[3] = _tmp34_;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[4] = _tmp35_;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[5] = _tmp36_;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_sources = _tmp37_;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_sources_length1 = 6;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_sources_size_ = adf_sources_length1;
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp38_ = g_strdup ("ADF Front");
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp39_ = SANE_I18N ("ADF Front");
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp40_ = g_strdup (_tmp39_);
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp41_ = g_new0 (gchar*, 2 + 1);
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp41_[0] = _tmp38_;
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp41_[1] = _tmp40_;
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_front_sources = _tmp41_;
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_front_sources_length1 = 2;
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_front_sources_size_ = adf_front_sources_length1;
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp42_ = g_strdup ("ADF Back");
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp43_ = SANE_I18N ("ADF Back");
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp44_ = g_strdup (_tmp43_);
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp45_ = g_new0 (gchar*, 2 + 1);
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp45_[0] = _tmp42_;
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp45_[1] = _tmp44_;
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_back_sources = _tmp45_;
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_back_sources_length1 = 2;
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_back_sources_size_ = adf_back_sources_length1;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp46_ = g_strdup ("ADF Duplex");
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp47_ = SANE_I18N ("ADF Duplex");
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp48_ = g_strdup (_tmp47_);
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp49_ = g_strdup ("ADF Duplex - Long-Edge Binding");
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp50_ = g_strdup ("ADF Duplex - Short-Edge Binding");
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_ = g_strdup ("Duplex");
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp52_ = g_strdup ("Automatic Document Feeder(centrally aligned,Duplex)");
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp53_ = g_strdup ("Automatic Document Feeder(left aligned,Duplex)");
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_ = g_new0 (gchar*, 7 + 1);
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[0] = _tmp46_;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[1] = _tmp48_;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[2] = _tmp49_;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[3] = _tmp50_;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[4] = _tmp51_;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[5] = _tmp52_;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[6] = _tmp53_;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources = _tmp54_;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources_length1 = 7;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_duplex_sources_size_ = adf_duplex_sources_length1;
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp55_ = job;
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp56_ = _tmp55_->type;
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			switch (_tmp56_) {
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_SINGLE:
 #line 9099 "scanner.c"
 				{
@@ -9109,15 +9109,15 @@ static void scanner_do_get_option (Scanner* self) {
 					SANE_Option_Descriptor* _tmp58_ = NULL;
 					SANE_Int _tmp59_ = {0};
 					gboolean _tmp60_ = FALSE;
-#line 947 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp57_ = self->priv->handle;
-#line 947 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp58_ = option;
-#line 947 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp59_ = index;
-#line 947 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp60_ = scanner_set_default_option (self, _tmp57_, _tmp58_, _tmp59_);
-#line 947 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp60_) {
 #line 9115 "scanner.c"
 						SANE_Handle _tmp61_ = {0};
@@ -9126,30 +9126,30 @@ static void scanner_do_get_option (Scanner* self) {
 						gchar** _tmp64_ = NULL;
 						gint _tmp64__length1 = 0;
 						gboolean _tmp65_ = FALSE;
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp61_ = self->priv->handle;
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp62_ = option;
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp63_ = index;
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp64_ = flatbed_sources;
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp64__length1 = flatbed_sources_length1;
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp65_ = scanner_set_constrained_string_option (self, _tmp61_, _tmp62_, _tmp63_, _tmp64_, _tmp64__length1, NULL);
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp65_) {
-#line 949 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:949: Unable to set single page source, please file a bug");
 #line 9138 "scanner.c"
 						}
 					}
-#line 950 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 9143 "scanner.c"
 				}
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_FRONT:
 #line 9147 "scanner.c"
 				{
@@ -9159,19 +9159,19 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp69_ = NULL;
 					gint _tmp69__length1 = 0;
 					gboolean _tmp70_ = FALSE;
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp66_ = self->priv->handle;
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp67_ = option;
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp68_ = index;
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp69_ = adf_front_sources;
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp69__length1 = adf_front_sources_length1;
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp70_ = scanner_set_constrained_string_option (self, _tmp66_, _tmp67_, _tmp68_, _tmp69_, _tmp69__length1, NULL);
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp70_) {
 #line 9169 "scanner.c"
 						SANE_Handle _tmp71_ = {0};
@@ -9180,30 +9180,30 @@ static void scanner_do_get_option (Scanner* self) {
 						gchar** _tmp74_ = NULL;
 						gint _tmp74__length1 = 0;
 						gboolean _tmp75_ = FALSE;
-#line 953 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp71_ = self->priv->handle;
-#line 953 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp72_ = option;
-#line 953 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp73_ = index;
-#line 953 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp74_ = adf_sources;
-#line 953 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp74__length1 = adf_sources_length1;
-#line 953 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp75_ = scanner_set_constrained_string_option (self, _tmp71_, _tmp72_, _tmp73_, _tmp74_, _tmp74__length1, NULL);
-#line 953 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp75_) {
-#line 954 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:954: Unable to set front ADF source, please file a bug");
 #line 9192 "scanner.c"
 						}
 					}
-#line 955 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 9197 "scanner.c"
 				}
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BACK:
 #line 9201 "scanner.c"
 				{
@@ -9213,19 +9213,19 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp79_ = NULL;
 					gint _tmp79__length1 = 0;
 					gboolean _tmp80_ = FALSE;
-#line 957 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp76_ = self->priv->handle;
-#line 957 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp77_ = option;
-#line 957 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp78_ = index;
-#line 957 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp79_ = adf_back_sources;
-#line 957 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp79__length1 = adf_back_sources_length1;
-#line 957 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp80_ = scanner_set_constrained_string_option (self, _tmp76_, _tmp77_, _tmp78_, _tmp79_, _tmp79__length1, NULL);
-#line 957 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp80_) {
 #line 9223 "scanner.c"
 						SANE_Handle _tmp81_ = {0};
@@ -9234,30 +9234,30 @@ static void scanner_do_get_option (Scanner* self) {
 						gchar** _tmp84_ = NULL;
 						gint _tmp84__length1 = 0;
 						gboolean _tmp85_ = FALSE;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp81_ = self->priv->handle;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp82_ = option;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp83_ = index;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp84_ = adf_sources;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp84__length1 = adf_sources_length1;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp85_ = scanner_set_constrained_string_option (self, _tmp81_, _tmp82_, _tmp83_, _tmp84_, _tmp84__length1, NULL);
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp85_) {
-#line 959 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:959: Unable to set back ADF source, please file a bug");
 #line 9246 "scanner.c"
 						}
 					}
-#line 960 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 9251 "scanner.c"
 				}
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BOTH:
 #line 9255 "scanner.c"
 				{
@@ -9267,19 +9267,19 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp89_ = NULL;
 					gint _tmp89__length1 = 0;
 					gboolean _tmp90_ = FALSE;
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp86_ = self->priv->handle;
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp87_ = option;
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88_ = index;
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp89_ = adf_duplex_sources;
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp89__length1 = adf_duplex_sources_length1;
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp90_ = scanner_set_constrained_string_option (self, _tmp86_, _tmp87_, _tmp88_, _tmp89_, _tmp89__length1, NULL);
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp90_) {
 #line 9277 "scanner.c"
 						SANE_Handle _tmp91_ = {0};
@@ -9288,59 +9288,59 @@ static void scanner_do_get_option (Scanner* self) {
 						gchar** _tmp94_ = NULL;
 						gint _tmp94__length1 = 0;
 						gboolean _tmp95_ = FALSE;
-#line 963 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp91_ = self->priv->handle;
-#line 963 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp92_ = option;
-#line 963 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp93_ = index;
-#line 963 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp94_ = adf_sources;
-#line 963 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp94__length1 = adf_sources_length1;
-#line 963 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp95_ = scanner_set_constrained_string_option (self, _tmp91_, _tmp92_, _tmp93_, _tmp94_, _tmp94__length1, NULL);
-#line 963 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp95_) {
-#line 964 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:964: Unable to set duplex ADF source, please file a bug");
 #line 9300 "scanner.c"
 						}
 					}
-#line 965 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 9305 "scanner.c"
 				}
 				default:
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 9310 "scanner.c"
 			}
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources = (_vala_array_free (adf_duplex_sources, adf_duplex_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_back_sources = (_vala_array_free (adf_back_sources, adf_back_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_front_sources = (_vala_array_free (adf_front_sources, adf_front_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_sources = (_vala_array_free (adf_sources, adf_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources = (_vala_array_free (flatbed_sources, flatbed_sources_length1, (GDestroyNotify) g_free), NULL);
 #line 9322 "scanner.c"
 		}
-#line 970 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp96_ = self->priv->handle;
-#line 970 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp97_ = SANE_NAME_SCAN_MODE;
-#line 970 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp99_ = scanner_get_option_by_name (self, _tmp96_, _tmp97_, &_tmp98_);
-#line 970 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp98_;
-#line 970 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp99_;
-#line 971 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp100_ = option;
-#line 971 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp100_ != NULL) {
 #line 9338 "scanner.c"
 			gchar** color_scan_modes = NULL;
@@ -9392,159 +9392,159 @@ static void scanner_do_get_option (Scanner* self) {
 			gint _lineart_scan_modes_size_ = 0;
 			ScanJob* _tmp139_ = NULL;
 			ScanMode _tmp140_ = 0;
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp101_ = SANE_VALUE_SCAN_MODE_COLOR;
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = g_strdup (_tmp101_);
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_ = g_strdup ("Color");
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp104_ = g_strdup ("24bit Color");
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp105_ = g_strdup ("Color - 16 Million Colors");
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_ = g_new0 (gchar*, 4 + 1);
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_[0] = _tmp102_;
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_[1] = _tmp103_;
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_[2] = _tmp104_;
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_[3] = _tmp105_;
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes = _tmp106_;
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes_length1 = 4;
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_color_scan_modes_size_ = color_scan_modes_length1;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp107_ = SANE_VALUE_SCAN_MODE_GRAY;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp108_ = g_strdup (_tmp107_);
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp109_ = g_strdup ("Gray");
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp110_ = g_strdup ("Grayscale");
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp111_ = SANE_I18N ("Grayscale");
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp112_ = g_strdup (_tmp111_);
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp113_ = g_strdup ("True Gray");
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp114_ = g_strdup ("Grayscale - 256 Levels");
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_ = g_new0 (gchar*, 6 + 1);
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[0] = _tmp108_;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[1] = _tmp109_;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[2] = _tmp110_;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[3] = _tmp112_;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[4] = _tmp113_;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[5] = _tmp114_;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			gray_scan_modes = _tmp115_;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			gray_scan_modes_length1 = 6;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_gray_scan_modes_size_ = gray_scan_modes_length1;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp116_ = SANE_VALUE_SCAN_MODE_LINEART;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp117_ = g_strdup (_tmp116_);
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp118_ = g_strdup ("Lineart");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp119_ = g_strdup ("LineArt");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp120_ = SANE_I18N ("LineArt");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp121_ = g_strdup (_tmp120_);
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp122_ = g_strdup ("Black & White");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp123_ = SANE_I18N ("Black & White");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp124_ = g_strdup (_tmp123_);
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp125_ = g_strdup ("Binary");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp126_ = SANE_I18N ("Binary");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp127_ = g_strdup (_tmp126_);
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp128_ = g_strdup ("Thresholded");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp129_ = SANE_VALUE_SCAN_MODE_GRAY;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp130_ = g_strdup (_tmp129_);
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp131_ = g_strdup ("Gray");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp132_ = g_strdup ("Grayscale");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp133_ = SANE_I18N ("Grayscale");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp134_ = g_strdup (_tmp133_);
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_ = g_strdup ("True Gray");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp136_ = g_strdup ("Black and White - Line Art");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp137_ = g_strdup ("Black and White - Halftone");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_ = g_new0 (gchar*, 16 + 1);
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[0] = _tmp117_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[1] = _tmp118_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[2] = _tmp119_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[3] = _tmp121_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[4] = _tmp122_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[5] = _tmp124_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[6] = _tmp125_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[7] = _tmp127_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[8] = _tmp128_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[9] = _tmp130_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[10] = _tmp131_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[11] = _tmp132_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[12] = _tmp134_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[13] = _tmp135_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[14] = _tmp136_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[15] = _tmp137_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			lineart_scan_modes = _tmp138_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			lineart_scan_modes_length1 = 16;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_lineart_scan_modes_size_ = lineart_scan_modes_length1;
-#line 1010 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp139_ = job;
-#line 1010 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp140_ = _tmp139_->scan_mode;
-#line 1010 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			switch (_tmp140_) {
-#line 1010 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_COLOR:
 #line 9542 "scanner.c"
 				{
@@ -9554,29 +9554,29 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp144_ = NULL;
 					gint _tmp144__length1 = 0;
 					gboolean _tmp145_ = FALSE;
-#line 1013 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp141_ = self->priv->handle;
-#line 1013 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp142_ = option;
-#line 1013 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp143_ = index;
-#line 1013 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp144_ = color_scan_modes;
-#line 1013 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp144__length1 = color_scan_modes_length1;
-#line 1013 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp145_ = scanner_set_constrained_string_option (self, _tmp141_, _tmp142_, _tmp143_, _tmp144_, _tmp144__length1, NULL);
-#line 1013 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp145_) {
-#line 1014 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						g_warning ("scanner.vala:1014: Unable to set Color mode, please file a bug");
 #line 9566 "scanner.c"
 					}
-#line 1015 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 9570 "scanner.c"
 				}
-#line 1010 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_GRAY:
 #line 9574 "scanner.c"
 				{
@@ -9586,29 +9586,29 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp149_ = NULL;
 					gint _tmp149__length1 = 0;
 					gboolean _tmp150_ = FALSE;
-#line 1017 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp146_ = self->priv->handle;
-#line 1017 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp147_ = option;
-#line 1017 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp148_ = index;
-#line 1017 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp149_ = gray_scan_modes;
-#line 1017 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp149__length1 = gray_scan_modes_length1;
-#line 1017 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp150_ = scanner_set_constrained_string_option (self, _tmp146_, _tmp147_, _tmp148_, _tmp149_, _tmp149__length1, NULL);
-#line 1017 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp150_) {
-#line 1018 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						g_warning ("scanner.vala:1018: Unable to set Gray mode, please file a bug");
 #line 9598 "scanner.c"
 					}
-#line 1019 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 9602 "scanner.c"
 				}
-#line 1010 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_LINEART:
 #line 9606 "scanner.c"
 				{
@@ -9618,63 +9618,63 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp154_ = NULL;
 					gint _tmp154__length1 = 0;
 					gboolean _tmp155_ = FALSE;
-#line 1021 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp151_ = self->priv->handle;
-#line 1021 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp152_ = option;
-#line 1021 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp153_ = index;
-#line 1021 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp154_ = lineart_scan_modes;
-#line 1021 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp154__length1 = lineart_scan_modes_length1;
-#line 1021 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp155_ = scanner_set_constrained_string_option (self, _tmp151_, _tmp152_, _tmp153_, _tmp154_, _tmp154__length1, NULL);
-#line 1021 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp155_) {
-#line 1022 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						g_warning ("scanner.vala:1022: Unable to set Lineart mode, please file a bug");
 #line 9630 "scanner.c"
 					}
-#line 1023 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1023 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 9634 "scanner.c"
 				}
 				default:
 				{
-#line 1025 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1025 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 9640 "scanner.c"
 				}
 			}
-#line 971 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			lineart_scan_modes = (_vala_array_free (lineart_scan_modes, lineart_scan_modes_length1, (GDestroyNotify) g_free), NULL);
-#line 971 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			gray_scan_modes = (_vala_array_free (gray_scan_modes, gray_scan_modes_length1, (GDestroyNotify) g_free), NULL);
-#line 971 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes = (_vala_array_free (color_scan_modes, color_scan_modes_length1, (GDestroyNotify) g_free), NULL);
 #line 9649 "scanner.c"
 		}
-#line 1030 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp156_ = self->priv->handle;
-#line 1030 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp158_ = scanner_get_option_by_name (self, _tmp156_, "duplex", &_tmp157_);
-#line 1030 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp157_;
-#line 1030 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp158_;
-#line 1031 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp159_ = option;
-#line 1031 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp159_ != NULL) {
 #line 9663 "scanner.c"
 			SANE_Option_Descriptor* _tmp160_ = NULL;
 			SANE_Value_Type _tmp161_ = 0;
-#line 1033 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp160_ = option;
-#line 1033 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp161_ = _tmp160_->type;
-#line 1033 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp161_ == SANE_TYPE_BOOL) {
 #line 9672 "scanner.c"
 				SANE_Handle _tmp162_ = {0};
@@ -9682,41 +9682,41 @@ static void scanner_do_get_option (Scanner* self) {
 				SANE_Int _tmp164_ = {0};
 				ScanJob* _tmp165_ = NULL;
 				ScanType _tmp166_ = 0;
-#line 1034 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp162_ = self->priv->handle;
-#line 1034 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp163_ = option;
-#line 1034 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp164_ = index;
-#line 1034 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp165_ = job;
-#line 1034 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp166_ = _tmp165_->type;
-#line 1034 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp162_, _tmp163_, _tmp164_, _tmp166_ == SCAN_TYPE_ADF_BOTH, NULL);
 #line 9690 "scanner.c"
 			}
 		}
-#line 1038 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp167_ = self->priv->handle;
-#line 1038 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp169_ = scanner_get_option_by_name (self, _tmp167_, "batch-scan", &_tmp168_);
-#line 1038 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp168_;
-#line 1038 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp169_;
-#line 1039 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp170_ = option;
-#line 1039 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp170_ != NULL) {
 #line 9705 "scanner.c"
 			SANE_Option_Descriptor* _tmp171_ = NULL;
 			SANE_Value_Type _tmp172_ = 0;
-#line 1041 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp171_ = option;
-#line 1041 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp172_ = _tmp171_->type;
-#line 1041 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp172_ == SANE_TYPE_BOOL) {
 #line 9714 "scanner.c"
 				SANE_Handle _tmp173_ = {0};
@@ -9724,32 +9724,32 @@ static void scanner_do_get_option (Scanner* self) {
 				SANE_Int _tmp175_ = {0};
 				ScanJob* _tmp176_ = NULL;
 				ScanType _tmp177_ = 0;
-#line 1042 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp173_ = self->priv->handle;
-#line 1042 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp174_ = option;
-#line 1042 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp175_ = index;
-#line 1042 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp176_ = job;
-#line 1042 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp177_ = _tmp176_->type;
-#line 1042 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp173_, _tmp174_, _tmp175_, _tmp177_ != SCAN_TYPE_SINGLE, NULL);
 #line 9732 "scanner.c"
 			}
 		}
-#line 1046 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp178_ = self->priv->handle;
-#line 1046 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp180_ = scanner_get_option_by_name (self, _tmp178_, "compression", &_tmp179_);
-#line 1046 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp179_;
-#line 1046 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp180_;
-#line 1047 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp181_ = option;
-#line 1047 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp181_ != NULL) {
 #line 9747 "scanner.c"
 			gchar** disable_compression_names = NULL;
@@ -9768,69 +9768,69 @@ static void scanner_do_get_option (Scanner* self) {
 			gchar** _tmp192_ = NULL;
 			gint _tmp192__length1 = 0;
 			gboolean _tmp193_ = FALSE;
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp182_ = SANE_I18N ("None");
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp183_ = g_strdup (_tmp182_);
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp184_ = SANE_I18N ("none");
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp185_ = g_strdup (_tmp184_);
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp186_ = g_strdup ("None");
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp187_ = g_strdup ("none");
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_ = g_new0 (gchar*, 4 + 1);
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_[0] = _tmp183_;
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_[1] = _tmp185_;
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_[2] = _tmp186_;
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_[3] = _tmp187_;
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names = _tmp188_;
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names_length1 = 4;
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_disable_compression_names_size_ = disable_compression_names_length1;
-#line 1057 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp189_ = self->priv->handle;
-#line 1057 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp190_ = option;
-#line 1057 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp191_ = index;
-#line 1057 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp192_ = disable_compression_names;
-#line 1057 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp192__length1 = disable_compression_names_length1;
-#line 1057 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp193_ = scanner_set_constrained_string_option (self, _tmp189_, _tmp190_, _tmp191_, _tmp192_, _tmp192__length1, NULL);
-#line 1057 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp193_) {
-#line 1058 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				g_warning ("scanner.vala:1058: Unable to disable compression, please file a bug");
 #line 9808 "scanner.c"
 			}
-#line 1047 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names = (_vala_array_free (disable_compression_names, disable_compression_names_length1, (GDestroyNotify) g_free), NULL);
 #line 9812 "scanner.c"
 		}
-#line 1062 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp194_ = self->priv->handle;
-#line 1062 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp195_ = SANE_NAME_SCAN_RESOLUTION;
-#line 1062 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp197_ = scanner_get_option_by_name (self, _tmp194_, _tmp195_, &_tmp196_);
-#line 1062 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp196_;
-#line 1062 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp197_;
-#line 1063 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp198_ = option;
-#line 1063 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp198_ != NULL) {
 #line 9828 "scanner.c"
 			SANE_Handle _tmp199_ = {0};
@@ -9845,44 +9845,44 @@ static void scanner_do_get_option (Scanner* self) {
 			gint _tmp208_ = 0;
 			SANE_Option_Descriptor* _tmp209_ = NULL;
 			SANE_Option_Descriptor* _tmp210_ = NULL;
-#line 1065 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp199_ = self->priv->handle;
-#line 1065 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp200_ = option;
-#line 1065 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp201_ = index;
-#line 1065 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp202_ = job;
-#line 1065 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp203_ = _tmp202_->dpi;
-#line 1065 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp204_ = job;
-#line 1065 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_set_fixed_or_int_option (self, _tmp199_, _tmp200_, _tmp201_, _tmp203_, &_tmp205_);
-#line 1065 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp204_->dpi = _tmp205_;
-#line 1066 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp206_ = self->priv->handle;
-#line 1066 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp207_ = SANE_NAME_BIT_DEPTH;
-#line 1066 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp209_ = scanner_get_option_by_name (self, _tmp206_, _tmp207_, &_tmp208_);
-#line 1066 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp208_;
-#line 1066 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp209_;
-#line 1067 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp210_ = option;
-#line 1067 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp210_ != NULL) {
 #line 9871 "scanner.c"
 				ScanJob* _tmp211_ = NULL;
 				gint _tmp212_ = 0;
-#line 1069 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp211_ = job;
-#line 1069 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp212_ = _tmp211_->depth;
-#line 1069 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp212_ > 0) {
 #line 9880 "scanner.c"
 					SANE_Handle _tmp213_ = {0};
@@ -9890,44 +9890,44 @@ static void scanner_do_get_option (Scanner* self) {
 					SANE_Int _tmp215_ = {0};
 					ScanJob* _tmp216_ = NULL;
 					gint _tmp217_ = 0;
-#line 1070 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp213_ = self->priv->handle;
-#line 1070 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp214_ = option;
-#line 1070 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp215_ = index;
-#line 1070 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp216_ = job;
-#line 1070 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp217_ = _tmp216_->depth;
-#line 1070 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_set_int_option (self, _tmp213_, _tmp214_, _tmp215_, _tmp217_, NULL);
 #line 9898 "scanner.c"
 				}
 			}
 		}
-#line 1075 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp218_ = self->priv->handle;
-#line 1075 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp219_ = SANE_NAME_SCAN_BR_X;
-#line 1075 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp221_ = scanner_get_option_by_name (self, _tmp218_, _tmp219_, &_tmp220_);
-#line 1075 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp220_;
-#line 1075 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp221_;
-#line 1076 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp222_ = option;
-#line 1076 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp222_ != NULL) {
 #line 9916 "scanner.c"
 			ScanJob* _tmp223_ = NULL;
 			gint _tmp224_ = 0;
-#line 1078 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp223_ = job;
-#line 1078 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp224_ = _tmp223_->page_width;
-#line 1078 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp224_ > 0) {
 #line 9925 "scanner.c"
 				SANE_Handle _tmp225_ = {0};
@@ -9939,64 +9939,64 @@ static void scanner_do_get_option (Scanner* self) {
 				ScanJob* _tmp231_ = NULL;
 				gdouble _tmp232_ = 0.0;
 				gdouble _tmp233_ = 0.0;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp225_ = self->priv->handle;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp226_ = option;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp227_ = index;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp228_ = option;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp229_ = job;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp230_ = _tmp229_->page_width;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp231_ = job;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp232_ = _tmp231_->dpi;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp233_ = scanner_convert_page_size (self, _tmp228_, (gdouble) _tmp230_, _tmp232_);
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_fixed_or_int_option (self, _tmp225_, _tmp226_, _tmp227_, _tmp233_, NULL);
 #line 9955 "scanner.c"
 			} else {
 				SANE_Handle _tmp234_ = {0};
 				SANE_Option_Descriptor* _tmp235_ = NULL;
 				SANE_Int _tmp236_ = {0};
-#line 1081 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp234_ = self->priv->handle;
-#line 1081 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp235_ = option;
-#line 1081 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp236_ = index;
-#line 1081 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_option_to_max (self, _tmp234_, _tmp235_, _tmp236_);
 #line 9968 "scanner.c"
 			}
 		}
-#line 1083 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp237_ = self->priv->handle;
-#line 1083 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp238_ = SANE_NAME_SCAN_BR_Y;
-#line 1083 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp240_ = scanner_get_option_by_name (self, _tmp237_, _tmp238_, &_tmp239_);
-#line 1083 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp239_;
-#line 1083 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp240_;
-#line 1084 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp241_ = option;
-#line 1084 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp241_ != NULL) {
 #line 9985 "scanner.c"
 			ScanJob* _tmp242_ = NULL;
 			gint _tmp243_ = 0;
-#line 1086 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp242_ = job;
-#line 1086 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp243_ = _tmp242_->page_height;
-#line 1086 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp243_ > 0) {
 #line 9994 "scanner.c"
 				SANE_Handle _tmp244_ = {0};
@@ -10008,72 +10008,72 @@ static void scanner_do_get_option (Scanner* self) {
 				ScanJob* _tmp250_ = NULL;
 				gdouble _tmp251_ = 0.0;
 				gdouble _tmp252_ = 0.0;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp244_ = self->priv->handle;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp245_ = option;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp246_ = index;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp247_ = option;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp248_ = job;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp249_ = _tmp248_->page_height;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp250_ = job;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp251_ = _tmp250_->dpi;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp252_ = scanner_convert_page_size (self, _tmp247_, (gdouble) _tmp249_, _tmp251_);
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_fixed_or_int_option (self, _tmp244_, _tmp245_, _tmp246_, _tmp252_, NULL);
 #line 10024 "scanner.c"
 			} else {
 				SANE_Handle _tmp253_ = {0};
 				SANE_Option_Descriptor* _tmp254_ = NULL;
 				SANE_Int _tmp255_ = {0};
-#line 1089 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1089 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp253_ = self->priv->handle;
-#line 1089 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1089 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp254_ = option;
-#line 1089 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1089 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp255_ = index;
-#line 1089 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1089 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_option_to_max (self, _tmp253_, _tmp254_, _tmp255_);
 #line 10037 "scanner.c"
 			}
 		}
-#line 1093 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp256_ = self->priv->handle;
-#line 1093 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp257_ = SANE_NAME_PAGE_WIDTH;
-#line 1093 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp259_ = scanner_get_option_by_name (self, _tmp256_, _tmp257_, &_tmp258_);
-#line 1093 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp258_;
-#line 1093 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp259_;
-#line 1094 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp261_ = option;
-#line 1094 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp261_ != NULL) {
 #line 10054 "scanner.c"
 			ScanJob* _tmp262_ = NULL;
 			gint _tmp263_ = 0;
-#line 1094 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp262_ = job;
-#line 1094 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp263_ = _tmp262_->page_width;
-#line 1094 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp260_ = ((gdouble) _tmp263_) > 0.0;
 #line 10063 "scanner.c"
 		} else {
-#line 1094 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp260_ = FALSE;
 #line 10067 "scanner.c"
 		}
-#line 1094 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp260_) {
 #line 10071 "scanner.c"
 			SANE_Handle _tmp264_ = {0};
@@ -10085,58 +10085,58 @@ static void scanner_do_get_option (Scanner* self) {
 			ScanJob* _tmp270_ = NULL;
 			gdouble _tmp271_ = 0.0;
 			gdouble _tmp272_ = 0.0;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp264_ = self->priv->handle;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp265_ = option;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp266_ = index;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp267_ = option;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp268_ = job;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp269_ = _tmp268_->page_width;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp270_ = job;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp271_ = _tmp270_->dpi;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp272_ = scanner_convert_page_size (self, _tmp267_, (gdouble) _tmp269_, _tmp271_);
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_set_fixed_or_int_option (self, _tmp264_, _tmp265_, _tmp266_, _tmp272_, NULL);
 #line 10101 "scanner.c"
 		}
-#line 1096 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp273_ = self->priv->handle;
-#line 1096 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp274_ = SANE_NAME_PAGE_HEIGHT;
-#line 1096 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp276_ = scanner_get_option_by_name (self, _tmp273_, _tmp274_, &_tmp275_);
-#line 1096 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp275_;
-#line 1096 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp276_;
-#line 1097 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp278_ = option;
-#line 1097 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp278_ != NULL) {
 #line 10117 "scanner.c"
 			ScanJob* _tmp279_ = NULL;
 			gint _tmp280_ = 0;
-#line 1097 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp279_ = job;
-#line 1097 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp280_ = _tmp279_->page_height;
-#line 1097 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp277_ = ((gdouble) _tmp280_) > 0.0;
 #line 10126 "scanner.c"
 		} else {
-#line 1097 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp277_ = FALSE;
 #line 10130 "scanner.c"
 		}
-#line 1097 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp277_) {
 #line 10134 "scanner.c"
 			SANE_Handle _tmp281_ = {0};
@@ -10148,50 +10148,50 @@ static void scanner_do_get_option (Scanner* self) {
 			ScanJob* _tmp287_ = NULL;
 			gdouble _tmp288_ = 0.0;
 			gdouble _tmp289_ = 0.0;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp281_ = self->priv->handle;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp282_ = option;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp283_ = index;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp284_ = option;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp285_ = job;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp286_ = _tmp285_->page_height;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp287_ = job;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp288_ = _tmp287_->dpi;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp289_ = scanner_convert_page_size (self, _tmp284_, (gdouble) _tmp286_, _tmp288_);
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_set_fixed_or_int_option (self, _tmp281_, _tmp282_, _tmp283_, _tmp289_, NULL);
 #line 10164 "scanner.c"
 		}
-#line 1100 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp290_ = self->priv->handle;
-#line 1100 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp291_ = SANE_NAME_BRIGHTNESS;
-#line 1100 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp293_ = scanner_get_option_by_name (self, _tmp290_, _tmp291_, &_tmp292_);
-#line 1100 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp292_;
-#line 1100 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp293_;
-#line 1101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp294_ = option;
-#line 1101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp294_ != NULL) {
 #line 10180 "scanner.c"
 			ScanJob* _tmp295_ = NULL;
 			gint _tmp296_ = 0;
-#line 1103 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp295_ = job;
-#line 1103 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp296_ = _tmp295_->brightness;
-#line 1103 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp296_ != 0) {
 #line 10189 "scanner.c"
 				gint brightness = 0;
@@ -10203,51 +10203,51 @@ static void scanner_do_get_option (Scanner* self) {
 				SANE_Option_Descriptor* _tmp302_ = NULL;
 				SANE_Int _tmp303_ = {0};
 				gint _tmp304_ = 0;
-#line 1105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp297_ = option;
-#line 1105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp298_ = job;
-#line 1105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp299_ = _tmp298_->brightness;
-#line 1105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp300_ = scanner_scale_int (self, -100, 100, _tmp297_, _tmp299_);
-#line 1105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				brightness = _tmp300_;
-#line 1106 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp301_ = self->priv->handle;
-#line 1106 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp302_ = option;
-#line 1106 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp303_ = index;
-#line 1106 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp304_ = brightness;
-#line 1106 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp301_, _tmp302_, _tmp303_, _tmp304_, NULL);
 #line 10219 "scanner.c"
 			}
 		}
-#line 1109 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp305_ = self->priv->handle;
-#line 1109 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp306_ = SANE_NAME_CONTRAST;
-#line 1109 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp308_ = scanner_get_option_by_name (self, _tmp305_, _tmp306_, &_tmp307_);
-#line 1109 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp307_;
-#line 1109 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp308_;
-#line 1110 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp309_ = option;
-#line 1110 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp309_ != NULL) {
 #line 10236 "scanner.c"
 			ScanJob* _tmp310_ = NULL;
 			gint _tmp311_ = 0;
-#line 1112 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp310_ = job;
-#line 1112 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp311_ = _tmp310_->contrast;
-#line 1112 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp311_ != 0) {
 #line 10245 "scanner.c"
 				gint contrast = 0;
@@ -10259,32 +10259,32 @@ static void scanner_do_get_option (Scanner* self) {
 				SANE_Option_Descriptor* _tmp317_ = NULL;
 				SANE_Int _tmp318_ = {0};
 				gint _tmp319_ = 0;
-#line 1114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp312_ = option;
-#line 1114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp313_ = job;
-#line 1114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp314_ = _tmp313_->contrast;
-#line 1114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp315_ = scanner_scale_int (self, -100, 100, _tmp312_, _tmp314_);
-#line 1114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				contrast = _tmp315_;
-#line 1115 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp316_ = self->priv->handle;
-#line 1115 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp317_ = option;
-#line 1115 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp318_ = index;
-#line 1115 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp319_ = contrast;
-#line 1115 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp316_, _tmp317_, _tmp318_, _tmp319_, NULL);
 #line 10275 "scanner.c"
 			}
 		}
-#line 1120 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp320_ = self->priv->current_device;
-#line 1120 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (g_strcmp0 (_tmp320_, "test") == 0) {
 #line 10282 "scanner.c"
 			SANE_Handle _tmp321_ = {0};
@@ -10307,200 +10307,200 @@ static void scanner_do_get_option (Scanner* self) {
 			gint _tmp350_ = 0;
 			SANE_Option_Descriptor* _tmp351_ = NULL;
 			SANE_Option_Descriptor* _tmp352_ = NULL;
-#line 1122 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp321_ = self->priv->handle;
-#line 1122 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp323_ = scanner_get_option_by_name (self, _tmp321_, "hand-scanner", &_tmp322_);
-#line 1122 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp322_;
-#line 1122 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp323_;
-#line 1123 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp324_ = option;
-#line 1123 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp324_ != NULL) {
 #line 10315 "scanner.c"
 				SANE_Handle _tmp325_ = {0};
 				SANE_Option_Descriptor* _tmp326_ = NULL;
 				SANE_Int _tmp327_ = {0};
-#line 1124 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp325_ = self->priv->handle;
-#line 1124 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp326_ = option;
-#line 1124 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp327_ = index;
-#line 1124 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp325_, _tmp326_, _tmp327_, FALSE, NULL);
 #line 10327 "scanner.c"
 			}
-#line 1125 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp328_ = self->priv->handle;
-#line 1125 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp330_ = scanner_get_option_by_name (self, _tmp328_, "three-pass", &_tmp329_);
-#line 1125 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp329_;
-#line 1125 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp330_;
-#line 1126 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp331_ = option;
-#line 1126 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp331_ != NULL) {
 #line 10341 "scanner.c"
 				SANE_Handle _tmp332_ = {0};
 				SANE_Option_Descriptor* _tmp333_ = NULL;
 				SANE_Int _tmp334_ = {0};
-#line 1127 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp332_ = self->priv->handle;
-#line 1127 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp333_ = option;
-#line 1127 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp334_ = index;
-#line 1127 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp332_, _tmp333_, _tmp334_, FALSE, NULL);
 #line 10353 "scanner.c"
 			}
-#line 1128 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp335_ = self->priv->handle;
-#line 1128 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp337_ = scanner_get_option_by_name (self, _tmp335_, "test-picture", &_tmp336_);
-#line 1128 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp336_;
-#line 1128 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp337_;
-#line 1129 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp338_ = option;
-#line 1129 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp338_ != NULL) {
 #line 10367 "scanner.c"
 				SANE_Handle _tmp339_ = {0};
 				SANE_Option_Descriptor* _tmp340_ = NULL;
 				SANE_Int _tmp341_ = {0};
-#line 1130 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp339_ = self->priv->handle;
-#line 1130 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp340_ = option;
-#line 1130 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp341_ = index;
-#line 1130 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_string_option (self, _tmp339_, _tmp340_, _tmp341_, "Color pattern", NULL);
 #line 10379 "scanner.c"
 			}
-#line 1131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp342_ = self->priv->handle;
-#line 1131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp344_ = scanner_get_option_by_name (self, _tmp342_, "read-delay", &_tmp343_);
-#line 1131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp343_;
-#line 1131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp344_;
-#line 1132 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp345_ = option;
-#line 1132 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp345_ != NULL) {
 #line 10393 "scanner.c"
 				SANE_Handle _tmp346_ = {0};
 				SANE_Option_Descriptor* _tmp347_ = NULL;
 				SANE_Int _tmp348_ = {0};
-#line 1133 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp346_ = self->priv->handle;
-#line 1133 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp347_ = option;
-#line 1133 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp348_ = index;
-#line 1133 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp346_, _tmp347_, _tmp348_, TRUE, NULL);
 #line 10405 "scanner.c"
 			}
-#line 1134 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp349_ = self->priv->handle;
-#line 1134 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp351_ = scanner_get_option_by_name (self, _tmp349_, "read-delay-duration", &_tmp350_);
-#line 1134 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp350_;
-#line 1134 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp351_;
-#line 1135 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1135 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp352_ = option;
-#line 1135 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1135 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp352_ != NULL) {
 #line 10419 "scanner.c"
 				SANE_Handle _tmp353_ = {0};
 				SANE_Option_Descriptor* _tmp354_ = NULL;
 				SANE_Int _tmp355_ = {0};
-#line 1136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp353_ = self->priv->handle;
-#line 1136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp354_ = option;
-#line 1136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp355_ = index;
-#line 1136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp353_, _tmp354_, _tmp355_, 200000, NULL);
 #line 10431 "scanner.c"
 			}
 		}
-#line 1139 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1139 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_START;
-#line 1140 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1140 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 10440 "scanner.c"
 	}
-#line 1143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp356_ = index;
-#line 1143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp357_ = option;
-#line 1143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_log_option (self, _tmp356_, _tmp357_);
-#line 1146 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp358_ = option;
-#line 1146 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp359_ = _tmp358_->type;
-#line 1146 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp359_ == SANE_TYPE_GROUP) {
-#line 1147 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1147 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 10458 "scanner.c"
 	}
-#line 1150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp360_ = option;
-#line 1150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp361_ = _tmp360_->cap;
-#line 1150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if ((_tmp361_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
-#line 1151 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1151 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 10470 "scanner.c"
 	}
-#line 1154 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp362_ = option;
-#line 1154 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp363_ = _tmp362_->name;
-#line 1154 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp363_ == NULL) {
-#line 1155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 10482 "scanner.c"
 	}
-#line 1157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp364_ = self->priv->options;
-#line 1157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp365_ = option;
-#line 1157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp366_ = _tmp365_->name;
-#line 1157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp367_ = g_strdup (_tmp366_);
-#line 1157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp368_ = index;
-#line 1157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_hash_table_insert (_tmp364_, _tmp367_, (gpointer) ((gintptr) ((gint) _tmp368_)));
-#line 879 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
 #line 10498 "scanner.c"
 }
@@ -10510,52 +10510,52 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 	gdouble result = 0.0;
 	SANE_Option_Descriptor* _tmp0_ = NULL;
 	SANE_Unit _tmp1_ = 0;
-#line 1160 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, 0.0);
-#line 1160 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, 0.0);
-#line 1162 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
-#line 1162 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->unit;
-#line 1162 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SANE_UNIT_PIXEL) {
 #line 10516 "scanner.c"
 		gdouble _tmp2_ = 0.0;
 		gdouble _tmp3_ = 0.0;
-#line 1163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = dpi;
-#line 1163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = size;
-#line 1163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = (_tmp2_ * _tmp3_) / 254.0;
-#line 1163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
 #line 10527 "scanner.c"
 	} else {
 		SANE_Option_Descriptor* _tmp4_ = NULL;
 		SANE_Unit _tmp5_ = 0;
-#line 1164 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = option;
-#line 1164 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = _tmp4_->unit;
-#line 1164 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp5_ == SANE_UNIT_MM) {
 #line 10537 "scanner.c"
 			gdouble _tmp6_ = 0.0;
-#line 1165 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = size;
-#line 1165 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp6_ / 10.0;
-#line 1165 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 10545 "scanner.c"
 		} else {
-#line 1168 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:1168: Unable to set unsupported unit type");
-#line 1169 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = (gdouble) 0.0f;
-#line 1169 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 10553 "scanner.c"
 		}
@@ -10573,49 +10573,49 @@ static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_H
 	SANE_Handle _tmp4_ = {0};
 	gint _tmp5_ = 0;
 	SANE_Option_Descriptor* _tmp6_ = NULL;
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 1175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->options;
-#line 1175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = name;
-#line 1175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_hash_table_lookup (_tmp0_, _tmp1_);
-#line 1175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_index = (gint) ((gintptr) _tmp2_);
-#line 1176 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _vala_index;
-#line 1176 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp3_ == 0) {
-#line 1177 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = NULL;
-#line 1177 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (index) {
-#line 1177 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			*index = _vala_index;
 #line 10591 "scanner.c"
 		}
-#line 1177 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
 #line 10595 "scanner.c"
 	}
-#line 1179 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = handle;
-#line 1179 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _vala_index;
-#line 1179 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = sane_get_option_descriptor (_tmp4_, (SANE_Int) _tmp5_);
-#line 1179 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp6_;
-#line 1179 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (index) {
-#line 1179 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*index = _vala_index;
 #line 10609 "scanner.c"
 	}
-#line 1179 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 10613 "scanner.c"
 }
@@ -10627,39 +10627,39 @@ static void scanner_do_complete_document (Scanner* self) {
 	GList* _tmp2_ = NULL;
 	NotifyDocumentDone* _tmp3_ = NULL;
 	NotifyDocumentDone* _tmp4_ = NULL;
-#line 1182 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1184 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->handle;
-#line 1184 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	sane_cancel (_tmp0_);
-#line 1185 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1185: sane_cancel ()");
-#line 1187 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->job_queue;
-#line 1187 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_queue = g_list_remove_link (self->priv->job_queue, _tmp1_);
-#line 1189 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
-#line 1192 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->job_queue;
-#line 1192 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_ != NULL) {
-#line 1194 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_OPEN;
-#line 1195 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1195 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 10645 "scanner.c"
 	}
-#line 1201 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = notify_document_done_new ();
-#line 1201 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_;
-#line 1201 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp4_);
-#line 1201 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp4_);
-#line 1202 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1202 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
 #line 10657 "scanner.c"
 }
@@ -10677,50 +10677,50 @@ static void scanner_do_start (Scanner* self) {
 	gchar* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
 	SANE_Status _tmp9_ = 0;
-#line 1205 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1205 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1209 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = notify_expect_page_new ();
-#line 1209 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_;
-#line 1209 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp1_);
-#line 1209 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp1_);
-#line 1211 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->handle;
-#line 1211 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = sane_start (_tmp2_);
-#line 1211 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp3_;
-#line 1212 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->page_number;
-#line 1212 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->pass_number;
-#line 1212 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = status;
-#line 1212 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = sane_status_to_string (_tmp6_);
-#line 1212 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_;
-#line 1212 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1212: sane_start (page=%d, pass=%d) -> %s", _tmp4_, _tmp5_, _tmp8_);
-#line 1212 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp8_);
-#line 1213 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = status;
-#line 1213 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ == SANE_STATUS_GOOD) {
-#line 1214 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_GET_PARAMETERS;
 #line 10709 "scanner.c"
 	} else {
 		SANE_Status _tmp10_ = 0;
-#line 1215 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = status;
-#line 1215 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp10_ == SANE_STATUS_NO_DOCS) {
-#line 1216 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_do_complete_document (self);
 #line 10718 "scanner.c"
 		} else {
@@ -10728,17 +10728,17 @@ static void scanner_do_start (Scanner* self) {
 			const gchar* _tmp12_ = NULL;
 			SANE_Status _tmp13_ = 0;
 			const gchar* _tmp14_ = NULL;
-#line 1219 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp11_ = status;
-#line 1219 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp12_ = sane_strstatus (_tmp11_);
-#line 1219 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:1219: Unable to start device: %s", _tmp12_);
-#line 1220 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp13_ = status;
-#line 1220 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp14_ = _ ("Unable to start scan");
-#line 1220 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_fail_scan (self, (gint) _tmp13_, _tmp14_);
 #line 10736 "scanner.c"
 		}
@@ -10749,72 +10749,72 @@ static void scanner_do_start (Scanner* self) {
 static gchar* sane_frame_to_string (SANE_Frame frame) {
 	gchar* result = NULL;
 	SANE_Frame _tmp0_ = 0;
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	_tmp0_ = frame;
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	switch (_tmp0_) {
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GRAY:
 #line 10751 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 106 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp1_ = g_strdup ("SANE_FRAME_GRAY");
-#line 106 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp1_;
-#line 106 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 10760 "scanner.c"
 		}
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RGB:
 #line 10764 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp2_ = g_strdup ("SANE_FRAME_RGB");
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp2_;
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 10773 "scanner.c"
 		}
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RED:
 #line 10777 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp3_ = g_strdup ("SANE_FRAME_RED");
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp3_;
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 10786 "scanner.c"
 		}
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GREEN:
 #line 10790 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp4_ = g_strdup ("SANE_FRAME_GREEN");
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp4_;
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 10799 "scanner.c"
 		}
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_BLUE:
 #line 10803 "scanner.c"
 		{
 			gchar* _tmp5_ = NULL;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp5_ = g_strdup ("SANE_FRAME_BLUE");
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp5_;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 10812 "scanner.c"
 		}
@@ -10822,13 +10822,13 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 		{
 			SANE_Frame _tmp6_ = 0;
 			gchar* _tmp7_ = NULL;
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp6_ = frame;
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp7_ = g_strdup_printf ("SANE_FRAME(%d)", (gint) _tmp6_);
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp7_;
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 10826 "scanner.c"
 		}
@@ -10897,242 +10897,242 @@ static void scanner_do_get_parameters (Scanner* self) {
 	gint _tmp72_ = 0;
 	gint _tmp73_ = 0;
 	guchar* _tmp74_ = NULL;
-#line 1226 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1228 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->handle;
-#line 1228 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = sane_get_parameters (_tmp0_, &_tmp1_);
-#line 1228 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->parameters = _tmp1_;
-#line 1228 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp2_;
-#line 1229 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = status;
-#line 1229 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = sane_status_to_string (_tmp3_);
-#line 1229 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_;
-#line 1229 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1229: sane_get_parameters () -> %s", _tmp5_);
-#line 1229 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp5_);
-#line 1230 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = status;
-#line 1230 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != SANE_STATUS_GOOD) {
 #line 10917 "scanner.c"
 		SANE_Status _tmp7_ = 0;
 		const gchar* _tmp8_ = NULL;
 		SANE_Status _tmp9_ = 0;
 		const gchar* _tmp10_ = NULL;
-#line 1232 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1232 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = status;
-#line 1232 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1232 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = sane_strstatus (_tmp7_);
-#line 1232 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1232 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:1232: Unable to get device parameters: %s", _tmp8_);
-#line 1233 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = status;
-#line 1233 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = _ ("Error communicating with scanner");
-#line 1233 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp9_, _tmp10_);
-#line 1236 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 10936 "scanner.c"
 	}
-#line 1239 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = self->priv->job_queue;
-#line 1239 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = _tmp11_->data;
-#line 1239 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp12_, TYPE_SCAN_JOB, ScanJob));
-#line 1239 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp13_;
-#line 1243 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = self->priv->parameters;
-#line 1243 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = _tmp15_.last_frame;
-#line 1243 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp16_) {
-#line 1243 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_TRUE";
 #line 10954 "scanner.c"
 	} else {
-#line 1243 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_FALSE";
 #line 10958 "scanner.c"
 	}
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = self->priv->parameters;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = _tmp17_.format;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = sane_frame_to_string (_tmp18_);
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = _tmp19_;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = self->priv->parameters;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = _tmp21_.bytes_per_line;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = self->priv->parameters;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = _tmp23_.pixels_per_line;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = self->priv->parameters;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = _tmp25_.lines;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = self->priv->parameters;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = _tmp27_.depth;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1241: Parameters: format=%s last_frame=%s bytes_per_line=" \
 "%d pixels_per_line=%d lines=%d depth=%d", _tmp20_, _tmp14_, _tmp22_, _tmp24_, _tmp26_, _tmp28_);
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp20_);
-#line 1249 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = scan_page_info_new ();
-#line 1249 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	info = _tmp29_;
-#line 1250 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = info;
-#line 1250 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = self->priv->parameters;
-#line 1250 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp32_ = _tmp31_.pixels_per_line;
-#line 1250 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_->width = _tmp32_;
-#line 1251 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_ = info;
-#line 1251 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = self->priv->parameters;
-#line 1251 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = _tmp34_.lines;
-#line 1251 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_->height = _tmp35_;
-#line 1252 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = info;
-#line 1252 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_ = self->priv->parameters;
-#line 1252 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = _tmp37_.depth;
-#line 1252 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_->depth = _tmp38_;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = self->priv->parameters;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = _tmp42_.depth;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp43_ == 8) {
 #line 11022 "scanner.c"
 		SANE_Parameters _tmp44_ = {0};
 		SANE_Frame _tmp45_ = 0;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp44_ = self->priv->parameters;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp45_ = _tmp44_.format;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = _tmp45_ == SANE_FRAME_GRAY;
 #line 11031 "scanner.c"
 	} else {
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = FALSE;
 #line 11035 "scanner.c"
 	}
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp41_) {
 #line 11039 "scanner.c"
 		ScanJob* _tmp46_ = NULL;
 		gint _tmp47_ = 0;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp46_ = job;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp47_ = _tmp46_->depth;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = _tmp47_ == 2;
 #line 11048 "scanner.c"
 	} else {
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = FALSE;
 #line 11052 "scanner.c"
 	}
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp40_) {
 #line 11056 "scanner.c"
 		ScanJob* _tmp48_ = NULL;
 		ScanMode _tmp49_ = 0;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp48_ = job;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp49_ = _tmp48_->scan_mode;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp39_ = _tmp49_ == SCAN_MODE_GRAY;
 #line 11065 "scanner.c"
 	} else {
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp39_ = FALSE;
 #line 11069 "scanner.c"
 	}
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp39_) {
 #line 11073 "scanner.c"
 		ScanPageInfo* _tmp50_ = NULL;
 		ScanJob* _tmp51_ = NULL;
 		gint _tmp52_ = 0;
-#line 1256 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp50_ = info;
-#line 1256 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp51_ = job;
-#line 1256 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp52_ = _tmp51_->depth;
-#line 1256 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp50_->depth = _tmp52_;
 #line 11085 "scanner.c"
 	}
-#line 1257 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp54_ = self->priv->parameters;
-#line 1257 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp55_ = _tmp54_.format;
-#line 1257 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp55_ == SANE_FRAME_GRAY) {
-#line 1257 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = 1;
 #line 11095 "scanner.c"
 	} else {
-#line 1257 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = 3;
 #line 11099 "scanner.c"
 	}
-#line 1257 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp56_ = info;
-#line 1257 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp56_->n_channels = _tmp53_;
-#line 1258 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp57_ = info;
-#line 1258 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp58_ = job;
-#line 1258 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp59_ = _tmp58_->dpi;
-#line 1258 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp57_->dpi = _tmp59_;
-#line 1259 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp60_ = info;
-#line 1259 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp61_ = self->priv->current_device;
-#line 1259 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp62_ = g_strdup (_tmp61_);
-#line 1259 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp60_->device);
-#line 1259 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp60_->device = _tmp62_;
-#line 1261 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp63_ = self->priv->page_number;
-#line 1261 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp64_ = self->priv->notified_page;
-#line 1261 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp63_ != _tmp64_) {
 #line 11129 "scanner.c"
 		ScanJob* _tmp65_ = NULL;
@@ -11141,55 +11141,55 @@ static void scanner_do_get_parameters (Scanner* self) {
 		NotifyGotPageInfo* _tmp68_ = NULL;
 		NotifyGotPageInfo* _tmp69_ = NULL;
 		gint _tmp70_ = 0;
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp65_ = job;
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp66_ = _tmp65_->id;
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp67_ = info;
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp68_ = notify_got_page_info_new (_tmp66_, _tmp67_);
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp69_ = _tmp68_;
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp69_);
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp69_);
-#line 1264 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp70_ = self->priv->page_number;
-#line 1264 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->notified_page = _tmp70_;
 #line 11154 "scanner.c"
 	}
-#line 1268 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp71_ = self->priv->parameters;
-#line 1268 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp72_ = _tmp71_.bytes_per_line;
-#line 1268 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	buffer_size = _tmp72_ + 1;
-#line 1269 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp73_ = buffer_size;
-#line 1269 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp74_ = g_new0 (guchar, _tmp73_);
-#line 1269 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 1269 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = _tmp74_;
-#line 1269 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer_length1 = _tmp73_;
-#line 1269 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->_buffer_size_ = self->priv->buffer_length1;
-#line 1270 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->n_used = 0;
-#line 1271 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->line_count = 0;
-#line 1272 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1272 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->pass_number = 0;
-#line 1273 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_READ;
-#line 1226 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_page_info_unref0 (info);
-#line 1226 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
 #line 11186 "scanner.c"
 }
@@ -11208,53 +11208,53 @@ static void scanner_do_complete_page (Scanner* self) {
 	gboolean _tmp8_ = FALSE;
 	ScanJob* _tmp10_ = NULL;
 	ScanType _tmp11_ = 0;
-#line 1276 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1278 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 1278 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 1278 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 1278 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = job;
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->id;
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = notify_page_done_new (_tmp4_);
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = _tmp5_;
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp6_);
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp6_);
-#line 1283 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = self->priv->parameters;
-#line 1283 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_.last_frame;
-#line 1283 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!_tmp8_) {
 #line 11231 "scanner.c"
 		gint _tmp9_ = 0;
-#line 1285 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1285 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->pass_number;
-#line 1285 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1285 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->pass_number = _tmp9_ + 1;
-#line 1286 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1286 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_START;
-#line 1287 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1287 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 11243 "scanner.c"
 	}
-#line 1291 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1291 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = job;
-#line 1291 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1291 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = _tmp10_->type;
-#line 1291 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1291 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp11_ != SCAN_TYPE_SINGLE) {
 #line 11251 "scanner.c"
 		gint _tmp12_ = 0;
@@ -11262,35 +11262,35 @@ static void scanner_do_complete_page (Scanner* self) {
 		gint _tmp14_ = 0;
 		NotifyPageDone* _tmp15_ = NULL;
 		NotifyPageDone* _tmp16_ = NULL;
-#line 1293 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = self->priv->page_number;
-#line 1293 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->page_number = _tmp12_ + 1;
-#line 1294 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->pass_number = 0;
-#line 1295 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = job;
-#line 1295 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = _tmp13_->id;
-#line 1295 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = notify_page_done_new (_tmp14_);
-#line 1295 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = _tmp15_;
-#line 1295 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp16_);
-#line 1295 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp16_);
-#line 1296 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_START;
-#line 1297 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1297 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 11281 "scanner.c"
 	}
-#line 1300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_do_complete_document (self);
-#line 1276 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
 #line 11287 "scanner.c"
 }
@@ -11331,197 +11331,197 @@ static void scanner_do_read (Scanner* self) {
 	gint _tmp40_ = 0;
 	SANE_Parameters _tmp41_ = {0};
 	gint _tmp42_ = 0;
-#line 1303 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1305 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 1305 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 1305 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 1305 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 1308 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = self->priv->buffer;
-#line 1308 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3__length1 = self->priv->buffer_length1;
-#line 1308 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->n_used;
-#line 1308 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	n_to_read = _tmp3__length1 - _tmp4_;
-#line 1311 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1311 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->buffer;
-#line 1311 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1311 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5__length1 = self->priv->buffer_length1;
-#line 1311 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1311 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	b = (guchar*) _tmp5_;
-#line 1312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = self->priv->handle;
-#line 1312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = b;
-#line 1312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = self->priv->n_used;
-#line 1312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = n_to_read;
-#line 1312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = sane_read (_tmp6_, (guint8*) (_tmp7_ + _tmp8_), (SANE_Int) _tmp9_, &_tmp10_);
-#line 1312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	n_read = _tmp10_;
-#line 1312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp11_;
-#line 1313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = n_to_read;
-#line 1313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = status;
-#line 1313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = sane_status_to_string (_tmp13_);
-#line 1313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = _tmp14_;
-#line 1313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = n_read;
-#line 1313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1313: sane_read (%d) -> (%s, %d)", _tmp12_, _tmp15_, (gint) _tmp16_);
-#line 1313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp15_);
-#line 1316 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = status;
-#line 1316 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp17_ == SANE_STATUS_EOF) {
 #line 11382 "scanner.c"
 		gboolean _tmp18_ = FALSE;
 		SANE_Parameters _tmp19_ = {0};
 		gint _tmp20_ = 0;
 		gint _tmp27_ = 0;
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = self->priv->parameters;
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp20_ = _tmp19_.lines;
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ > 0) {
 #line 11393 "scanner.c"
 			gint _tmp21_ = 0;
 			SANE_Parameters _tmp22_ = {0};
 			gint _tmp23_ = 0;
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = self->priv->line_count;
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = self->priv->parameters;
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = _tmp22_.lines;
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = _tmp21_ != _tmp23_;
 #line 11405 "scanner.c"
 		} else {
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = FALSE;
 #line 11409 "scanner.c"
 		}
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp18_) {
 #line 11413 "scanner.c"
 			gint _tmp24_ = 0;
 			SANE_Parameters _tmp25_ = {0};
 			gint _tmp26_ = 0;
-#line 1319 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp24_ = self->priv->line_count;
-#line 1319 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = self->priv->parameters;
-#line 1319 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp26_ = _tmp25_.lines;
-#line 1319 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:1319: Scan completed with %d lines, expected %d lines", _tmp24_, _tmp26_);
 #line 11425 "scanner.c"
 		}
-#line 1320 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp27_ = self->priv->n_used;
-#line 1320 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp27_ > 0) {
 #line 11431 "scanner.c"
 			gint _tmp28_ = 0;
-#line 1321 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = self->priv->n_used;
-#line 1321 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:1321: Scan complete with %d bytes of unused data", _tmp28_);
 #line 11437 "scanner.c"
 		}
-#line 1322 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_do_complete_page (self);
-#line 1323 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1323 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1323 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1323 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 11445 "scanner.c"
 	}
-#line 1327 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = status;
-#line 1327 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp29_ != SANE_STATUS_GOOD) {
 #line 11451 "scanner.c"
 		SANE_Status _tmp30_ = 0;
 		const gchar* _tmp31_ = NULL;
 		SANE_Status _tmp32_ = 0;
 		const gchar* _tmp33_ = NULL;
-#line 1329 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp30_ = status;
-#line 1329 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp31_ = sane_strstatus (_tmp30_);
-#line 1329 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:1329: Unable to read frame from device: %s", _tmp31_);
-#line 1330 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp32_ = status;
-#line 1330 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp33_ = _ ("Error communicating with scanner");
-#line 1330 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp32_, _tmp33_);
-#line 1333 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1333 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 11472 "scanner.c"
 	}
-#line 1336 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	full_read = FALSE;
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = self->priv->n_used;
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp35_ == 0) {
 #line 11480 "scanner.c"
 		SANE_Int _tmp36_ = {0};
 		guchar* _tmp37_ = NULL;
 		gint _tmp37__length1 = 0;
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp36_ = n_read;
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp37_ = self->priv->buffer;
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp37__length1 = self->priv->buffer_length1;
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = _tmp36_ == ((SANE_Int) _tmp37__length1);
 #line 11492 "scanner.c"
 	} else {
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = FALSE;
 #line 11496 "scanner.c"
 	}
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp34_) {
-#line 1338 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		full_read = TRUE;
 #line 11502 "scanner.c"
 	}
-#line 1339 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = self->priv->n_used;
-#line 1339 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = n_read;
-#line 1339 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->n_used = _tmp38_ + ((gint) _tmp39_);
-#line 1342 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_ = self->priv->n_used;
-#line 1342 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = self->priv->parameters;
-#line 1342 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = _tmp41_.bytes_per_line;
-#line 1342 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp40_ >= _tmp42_) {
 #line 11518 "scanner.c"
 		ScanLine* line = NULL;
@@ -11572,213 +11572,213 @@ static void scanner_do_read (Scanner* self) {
 		ScanLine* _tmp155_ = NULL;
 		NotifyGotLine* _tmp156_ = NULL;
 		NotifyGotLine* _tmp157_ = NULL;
-#line 1344 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1344 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp43_ = scan_line_new ();
-#line 1344 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1344 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		line = _tmp43_;
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp44_ = self->priv->parameters;
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp45_ = _tmp44_.format;
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		switch (_tmp45_) {
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GRAY:
 #line 11579 "scanner.c"
 			{
 				ScanLine* _tmp46_ = NULL;
-#line 1348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp46_ = line;
-#line 1348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp46_->channel = 0;
-#line 1349 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 11588 "scanner.c"
 			}
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RGB:
 #line 11592 "scanner.c"
 			{
 				ScanLine* _tmp47_ = NULL;
-#line 1351 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp47_ = line;
-#line 1351 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp47_->channel = -1;
-#line 1352 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 11601 "scanner.c"
 			}
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RED:
 #line 11605 "scanner.c"
 			{
 				ScanLine* _tmp48_ = NULL;
-#line 1354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp48_ = line;
-#line 1354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp48_->channel = 0;
-#line 1355 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 11614 "scanner.c"
 			}
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GREEN:
 #line 11618 "scanner.c"
 			{
 				ScanLine* _tmp49_ = NULL;
-#line 1357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp49_ = line;
-#line 1357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp49_->channel = 1;
-#line 1358 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 11627 "scanner.c"
 			}
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_BLUE:
 #line 11631 "scanner.c"
 			{
 				ScanLine* _tmp50_ = NULL;
-#line 1360 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp50_ = line;
-#line 1360 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp50_->channel = 2;
-#line 1361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 11640 "scanner.c"
 			}
 			default:
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 11645 "scanner.c"
 		}
-#line 1363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp51_ = line;
-#line 1363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp52_ = self->priv->parameters;
-#line 1363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = _tmp52_.pixels_per_line;
-#line 1363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp51_->width = _tmp53_;
-#line 1364 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp54_ = line;
-#line 1364 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp55_ = self->priv->parameters;
-#line 1364 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp56_ = _tmp55_.depth;
-#line 1364 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp54_->depth = _tmp56_;
-#line 1365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_ = line;
-#line 1365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp58_ = self->priv->buffer;
-#line 1365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp58__length1 = self->priv->buffer_length1;
-#line 1365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = NULL;
-#line 1365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer_length1 = 0;
-#line 1365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_->data = (g_free (_tmp57_->data), NULL);
-#line 1365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_->data = _tmp58_;
-#line 1365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_->data_length1 = _tmp58__length1;
-#line 1366 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_ = line;
-#line 1366 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp60_ = self->priv->parameters;
-#line 1366 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp61_ = _tmp60_.bytes_per_line;
-#line 1366 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_->data_length = _tmp61_;
-#line 1367 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp62_ = line;
-#line 1367 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp63_ = self->priv->line_count;
-#line 1367 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp62_->number = _tmp63_;
-#line 1368 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp64_ = line;
-#line 1368 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp65_ = self->priv->n_used;
-#line 1368 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp66_ = line;
-#line 1368 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp67_ = _tmp66_->data_length;
-#line 1368 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp64_->n_lines = _tmp65_ / _tmp67_;
-#line 1370 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp68_ = self->priv->line_count;
-#line 1370 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp69_ = line;
-#line 1370 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp70_ = _tmp69_->n_lines;
-#line 1370 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->line_count = _tmp68_ + _tmp70_;
-#line 1373 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp71_ = line;
-#line 1373 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp72_ = _tmp71_->data;
-#line 1373 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp72__length1 = _tmp71_->data_length1;
-#line 1373 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		buffer_size = _tmp72__length1;
-#line 1374 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp73_ = full_read;
-#line 1374 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp73_) {
 #line 11723 "scanner.c"
 			gint _tmp74_ = 0;
 			SANE_Parameters _tmp75_ = {0};
 			gint _tmp76_ = 0;
-#line 1375 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp74_ = buffer_size;
-#line 1375 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp75_ = self->priv->parameters;
-#line 1375 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp76_ = _tmp75_.bytes_per_line;
-#line 1375 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			buffer_size = _tmp74_ + _tmp76_;
 #line 11735 "scanner.c"
 		}
-#line 1377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp77_ = buffer_size;
-#line 1377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp78_ = g_new0 (guchar, _tmp77_);
-#line 1377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 1377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = _tmp78_;
-#line 1377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer_length1 = _tmp77_;
-#line 1377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->_buffer_size_ = self->priv->buffer_length1;
-#line 1378 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp79_ = self->priv->n_used;
-#line 1378 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp80_ = line;
-#line 1378 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp81_ = _tmp80_->n_lines;
-#line 1378 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp82_ = line;
-#line 1378 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp83_ = _tmp82_->data_length;
-#line 1378 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		n_remaining = _tmp79_ - (_tmp81_ * _tmp83_);
-#line 1379 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->n_used = 0;
 #line 11763 "scanner.c"
 		{
 			gint i = 0;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			i = 0;
 #line 11768 "scanner.c"
 			{
 				gboolean _tmp84_ = FALSE;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp84_ = TRUE;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				while (TRUE) {
 #line 11775 "scanner.c"
 					gint _tmp86_ = 0;
@@ -11797,120 +11797,120 @@ static void scanner_do_read (Scanner* self) {
 					guchar _tmp97_ = '\0';
 					guchar _tmp98_ = '\0';
 					gint _tmp99_ = 0;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp84_) {
 #line 11794 "scanner.c"
 						gint _tmp85_ = 0;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp85_ = i;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						i = _tmp85_ + 1;
 #line 11800 "scanner.c"
 					}
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp84_ = FALSE;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp86_ = i;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp87_ = n_remaining;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!(_tmp86_ < _tmp87_)) {
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						break;
 #line 11812 "scanner.c"
 					}
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88_ = self->priv->buffer;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88__length1 = self->priv->buffer_length1;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp89_ = i;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp90_ = line;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp91_ = _tmp90_->data;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp91__length1 = _tmp90_->data_length1;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp92_ = i;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp93_ = line;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp94_ = _tmp93_->n_lines;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp95_ = line;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp96_ = _tmp95_->data_length;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp97_ = _tmp91_[_tmp92_ + (_tmp94_ * _tmp96_)];
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88_[_tmp89_] = _tmp97_;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp98_ = _tmp88_[_tmp89_];
-#line 1383 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp99_ = self->priv->n_used;
-#line 1383 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->n_used = _tmp99_ + 1;
 #line 11846 "scanner.c"
 				}
 			}
 		}
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp103_ = self->priv->parameters;
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp104_ = _tmp103_.depth;
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp104_ == 8) {
 #line 11856 "scanner.c"
 			SANE_Parameters _tmp105_ = {0};
 			SANE_Frame _tmp106_ = 0;
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp105_ = self->priv->parameters;
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_ = _tmp105_.format;
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = _tmp106_ == SANE_FRAME_GRAY;
 #line 11865 "scanner.c"
 		} else {
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = FALSE;
 #line 11869 "scanner.c"
 		}
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp102_) {
 #line 11873 "scanner.c"
 			ScanJob* _tmp107_ = NULL;
 			gint _tmp108_ = 0;
-#line 1389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp107_ = job;
-#line 1389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp108_ = _tmp107_->depth;
-#line 1389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp101_ = _tmp108_ == 2;
 #line 11882 "scanner.c"
 		} else {
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp101_ = FALSE;
 #line 11886 "scanner.c"
 		}
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp101_) {
 #line 11890 "scanner.c"
 			ScanJob* _tmp109_ = NULL;
 			ScanMode _tmp110_ = 0;
-#line 1389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp109_ = job;
-#line 1389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp110_ = _tmp109_->scan_mode;
-#line 1389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp100_ = _tmp110_ == SCAN_MODE_GRAY;
 #line 11899 "scanner.c"
 		} else {
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp100_ = FALSE;
 #line 11903 "scanner.c"
 		}
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp100_) {
 #line 11907 "scanner.c"
 			guchar block = '\0';
@@ -11919,23 +11919,23 @@ static void scanner_do_read (Scanner* self) {
 			ScanLine* _tmp150_ = NULL;
 			ScanLine* _tmp151_ = NULL;
 			gint _tmp152_ = 0;
-#line 1391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			block = (guchar) 0;
-#line 1392 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			write_offset = 0;
-#line 1393 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			block_shift = 6;
 #line 11920 "scanner.c"
 			{
 				gint i = 0;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
 #line 11925 "scanner.c"
 				{
 					gboolean _tmp111_ = FALSE;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp111_ = TRUE;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
 #line 11932 "scanner.c"
 						gint _tmp113_ = 0;
@@ -11946,49 +11946,49 @@ static void scanner_do_read (Scanner* self) {
 						ScanLine* _tmp117_ = NULL;
 						gint _tmp118_ = 0;
 						gint _tmp143_ = 0;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp111_) {
 #line 11943 "scanner.c"
 							gint _tmp112_ = 0;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp112_ = i;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp112_ + 1;
 #line 11949 "scanner.c"
 						}
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp111_ = FALSE;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp113_ = i;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp114_ = line;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp115_ = _tmp114_->n_lines;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(_tmp113_ < _tmp115_)) {
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
 #line 11963 "scanner.c"
 						}
-#line 1396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp116_ = i;
-#line 1396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp117_ = line;
-#line 1396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp118_ = _tmp117_->data_length;
-#line 1396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						offset = _tmp116_ * _tmp118_;
 #line 11973 "scanner.c"
 						{
 							gint x = 0;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							x = 0;
 #line 11978 "scanner.c"
 							{
 								gboolean _tmp119_ = FALSE;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								_tmp119_ = TRUE;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								while (TRUE) {
 #line 11985 "scanner.c"
 									gint _tmp121_ = 0;
@@ -12007,87 +12007,87 @@ static void scanner_do_read (Scanner* self) {
 									guchar _tmp133_ = '\0';
 									gint _tmp134_ = 0;
 									gint _tmp135_ = 0;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (!_tmp119_) {
 #line 12004 "scanner.c"
 										gint _tmp120_ = 0;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp120_ = x;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										x = _tmp120_ + 1;
 #line 12010 "scanner.c"
 									}
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp119_ = FALSE;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp121_ = x;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp122_ = line;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp123_ = _tmp122_->width;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (!(_tmp121_ < _tmp123_)) {
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										break;
 #line 12024 "scanner.c"
 									}
-#line 1399 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp124_ = line;
-#line 1399 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp125_ = _tmp124_->data;
-#line 1399 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp125__length1 = _tmp124_->data_length1;
-#line 1399 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp126_ = offset;
-#line 1399 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp127_ = x;
-#line 1399 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp128_ = _tmp125_[_tmp126_ + _tmp127_];
-#line 1399 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									p = _tmp128_;
-#line 1402 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp129_ = p;
-#line 1402 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (((gint) _tmp129_) >= 192) {
-#line 1403 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										sample = (guchar) 3;
 #line 12046 "scanner.c"
 									} else {
 										guchar _tmp130_ = '\0';
-#line 1404 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp130_ = p;
-#line 1404 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										if (((gint) _tmp130_) >= 128) {
-#line 1405 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1405 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											sample = (guchar) 2;
 #line 12055 "scanner.c"
 										} else {
 											guchar _tmp131_ = '\0';
-#line 1406 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1406 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											_tmp131_ = p;
-#line 1406 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1406 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											if (((gint) _tmp131_) >= 64) {
-#line 1407 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 1;
 #line 12064 "scanner.c"
 											} else {
-#line 1409 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 0;
 #line 12068 "scanner.c"
 											}
 										}
 									}
-#line 1411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp132_ = block;
-#line 1411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp133_ = sample;
-#line 1411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp134_ = block_shift;
-#line 1411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									block = _tmp132_ | (_tmp133_ << _tmp134_);
-#line 1412 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp135_ = block_shift;
-#line 1412 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (_tmp135_ == 0) {
 #line 12084 "scanner.c"
 										ScanLine* _tmp136_ = NULL;
@@ -12097,43 +12097,43 @@ static void scanner_do_read (Scanner* self) {
 										guchar _tmp139_ = '\0';
 										guchar _tmp140_ = '\0';
 										gint _tmp141_ = 0;
-#line 1414 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp136_ = line;
-#line 1414 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp137_ = _tmp136_->data;
-#line 1414 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp137__length1 = _tmp136_->data_length1;
-#line 1414 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp138_ = write_offset;
-#line 1414 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp139_ = block;
-#line 1414 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp137_[_tmp138_] = _tmp139_;
-#line 1414 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp140_ = _tmp137_[_tmp138_];
-#line 1415 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp141_ = write_offset;
-#line 1415 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										write_offset = _tmp141_ + 1;
-#line 1416 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block = (guchar) 0;
-#line 1417 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = 6;
 #line 12114 "scanner.c"
 									} else {
 										gint _tmp142_ = 0;
-#line 1420 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp142_ = block_shift;
-#line 1420 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = _tmp142_ - 2;
 #line 12121 "scanner.c"
 									}
 								}
 							}
 						}
-#line 1424 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp143_ = block_shift;
-#line 1424 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp143_ != 6) {
 #line 12130 "scanner.c"
 							ScanLine* _tmp144_ = NULL;
@@ -12143,69 +12143,69 @@ static void scanner_do_read (Scanner* self) {
 							guchar _tmp147_ = '\0';
 							guchar _tmp148_ = '\0';
 							gint _tmp149_ = 0;
-#line 1426 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp144_ = line;
-#line 1426 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp145_ = _tmp144_->data;
-#line 1426 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp145__length1 = _tmp144_->data_length1;
-#line 1426 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp146_ = write_offset;
-#line 1426 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp147_ = block;
-#line 1426 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp145_[_tmp146_] = _tmp147_;
-#line 1426 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp148_ = _tmp145_[_tmp146_];
-#line 1427 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp149_ = write_offset;
-#line 1427 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							write_offset = _tmp149_ + 1;
-#line 1428 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							block = (guchar) 0;
-#line 1429 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1429 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							block_shift = 6;
 #line 12160 "scanner.c"
 						}
 					}
 				}
 			}
-#line 1433 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp150_ = line;
-#line 1433 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp151_ = line;
-#line 1433 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp152_ = _tmp151_->width;
-#line 1433 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp150_->data_length = ((_tmp152_ * 2) + 7) / 8;
 #line 12173 "scanner.c"
 		}
-#line 1436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp153_ = job;
-#line 1436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp154_ = _tmp153_->id;
-#line 1436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp155_ = line;
-#line 1436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp156_ = notify_got_line_new (_tmp154_, _tmp155_);
-#line 1436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp157_ = _tmp156_;
-#line 1436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp157_);
-#line 1436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp157_);
-#line 1342 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_line_unref0 (line);
 #line 12191 "scanner.c"
 	}
-#line 1303 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
 #line 12195 "scanner.c"
 }
 
 
 static void _scanner_authorization_cb_sane_authcallback (const gchar* resource, gchar* username, gchar* password) {
-#line 1445 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_authorization_cb (resource, username, -1, password, -1);
 #line 12202 "scanner.c"
 }
@@ -12227,166 +12227,166 @@ static void* scanner_scan_thread (Scanner* self) {
 	gint _tmp11_ = 0;
 	SANE_Int _tmp12_ = {0};
 	gint _tmp13_ = 0;
-#line 1440 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1442 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
-#line 1445 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = sane_init (&_tmp0_, _scanner_authorization_cb_sane_authcallback);
-#line 1445 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	version_code = _tmp0_;
-#line 1445 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp1_;
-#line 1446 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = status;
-#line 1446 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = sane_status_to_string (_tmp2_);
-#line 1446 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_;
-#line 1446 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1446: sane_init () -> %s", _tmp4_);
-#line 1446 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp4_);
-#line 1447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = status;
-#line 1447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
 #line 12246 "scanner.c"
 		SANE_Status _tmp6_ = 0;
 		const gchar* _tmp7_ = NULL;
-#line 1449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = status;
-#line 1449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = sane_strstatus (_tmp6_);
-#line 1449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:1449: Unable to initialize SANE backend: %s", _tmp7_);
-#line 1450 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = NULL;
-#line 1450 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
 #line 12259 "scanner.c"
 	}
-#line 1452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = version_code;
-#line 1452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = SANE_VERSION_MAJOR (_tmp8_);
-#line 1452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = version_code;
-#line 1452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = SANE_VERSION_MINOR (_tmp10_);
-#line 1452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = version_code;
-#line 1452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = SANE_VERSION_BUILD (_tmp12_);
-#line 1452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1452: SANE version %d.%d.%d", _tmp9_, _tmp11_, _tmp13_);
-#line 1458 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_redetect (self);
-#line 1460 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
 #line 12279 "scanner.c"
 		gboolean _tmp14_ = FALSE;
 		ScanState _tmp15_ = 0;
-#line 1460 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = scanner_handle_requests (self);
-#line 1460 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (!_tmp14_) {
-#line 1460 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 12288 "scanner.c"
 		}
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = self->priv->state;
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		switch (_tmp15_) {
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_IDLE:
 #line 12296 "scanner.c"
 			{
 				GList* _tmp16_ = NULL;
-#line 1465 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_ = self->priv->job_queue;
-#line 1465 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp16_ != NULL) {
-#line 1467 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_set_scanning (self, TRUE);
-#line 1468 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1468 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->state = SCAN_STATE_OPEN;
 #line 12307 "scanner.c"
 				}
-#line 1470 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1470 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 12311 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_REDETECT:
 #line 12315 "scanner.c"
 			{
-#line 1472 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_redetect (self);
-#line 1473 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 12321 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_OPEN:
 #line 12325 "scanner.c"
 			{
-#line 1475 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_open (self);
-#line 1476 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 12331 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_OPTION:
 #line 12335 "scanner.c"
 			{
-#line 1478 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_option (self);
-#line 1479 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 12341 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_START:
 #line 12345 "scanner.c"
 			{
-#line 1481 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_start (self);
-#line 1482 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 12351 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_PARAMETERS:
 #line 12355 "scanner.c"
 			{
-#line 1484 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_parameters (self);
-#line 1485 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 12361 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_READ:
 #line 12365 "scanner.c"
 			{
-#line 1487 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1487 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_read (self);
-#line 1488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 12371 "scanner.c"
 			}
 			default:
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 12376 "scanner.c"
 		}
 	}
-#line 1492 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = NULL;
-#line 1492 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 12383 "scanner.c"
 }
@@ -12395,9 +12395,9 @@ static void* scanner_scan_thread (Scanner* self) {
 static gpointer _scanner_scan_thread_gthread_func (gpointer self) {
 	gpointer result;
 	result = scanner_scan_thread ((Scanner*) self);
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_unref (self);
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 12394 "scanner.c"
 }
@@ -12405,31 +12405,31 @@ static gpointer _scanner_scan_thread_gthread_func (gpointer self) {
 
 void scanner_start (Scanner* self) {
 	GError * _inner_error_ = NULL;
-#line 1495 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1495 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 12402 "scanner.c"
 	{
 		GThread* _tmp0_ = NULL;
 		GThread* _tmp1_ = NULL;
 		GThread* _tmp2_ = NULL;
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = g_thread_try_new ("scan-thread", _scanner_scan_thread_gthread_func, scanner_ref (self), &_inner_error_);
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp1_;
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12413 "scanner.c"
 			goto __catch15_g_error;
 		}
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = _tmp0_;
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = NULL;
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (self->priv->thread);
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->thread = _tmp2_;
-#line 1497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (_tmp0_);
 #line 12426 "scanner.c"
 	}
@@ -12439,28 +12439,28 @@ void scanner_start (Scanner* self) {
 		GError* e = NULL;
 		GError* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
-#line 1497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		e = _inner_error_;
-#line 1497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_inner_error_ = NULL;
-#line 1503 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1503 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = e;
-#line 1503 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1503 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = _tmp3_->message;
-#line 1503 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1503 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_critical ("scanner.vala:1503: Unable to create thread: %s", _tmp4_);
-#line 1497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_error_free0 (e);
 #line 12446 "scanner.c"
 	}
 	__finally15:
-#line 1497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.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 1497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_clear_error (&_inner_error_);
-#line 1497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 12457 "scanner.c"
 	}
@@ -12471,25 +12471,25 @@ void scanner_redetect (Scanner* self) {
 	gboolean _tmp0_ = FALSE;
 	GAsyncQueue* _tmp1_ = NULL;
 	RequestRedetect* _tmp2_ = NULL;
-#line 1507 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1509 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->need_redetect;
-#line 1509 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 1510 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 12474 "scanner.c"
 	}
-#line 1511 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->need_redetect = TRUE;
-#line 1513 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1513: Requesting redetection of scan devices");
-#line 1515 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->request_queue;
-#line 1515 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = request_redetect_new ();
-#line 1515 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
 #line 12486 "scanner.c"
 }
@@ -12498,13 +12498,13 @@ void scanner_redetect (Scanner* self) {
 gboolean scanner_is_scanning (Scanner* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1518 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1520 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->scanning;
-#line 1520 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp0_;
-#line 1520 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 12501 "scanner.c"
 }
@@ -12513,61 +12513,61 @@ gboolean scanner_is_scanning (Scanner* self) {
 static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 	gchar* result = NULL;
 	ScanMode _tmp0_ = 0;
-#line 1523 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1523 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1525 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = mode;
-#line 1525 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp0_) {
-#line 1525 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_DEFAULT:
 #line 12516 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 1528 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp1_ = g_strdup ("ScanMode.DEFAULT");
-#line 1528 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp1_;
-#line 1528 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12525 "scanner.c"
 		}
-#line 1525 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_COLOR:
 #line 12529 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 1530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp2_ = g_strdup ("ScanMode.COLOR");
-#line 1530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp2_;
-#line 1530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12538 "scanner.c"
 		}
-#line 1525 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_GRAY:
 #line 12542 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 1532 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = g_strdup ("ScanMode.GRAY");
-#line 1532 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp3_;
-#line 1532 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12551 "scanner.c"
 		}
-#line 1525 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_LINEART:
 #line 12555 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
-#line 1534 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = g_strdup ("ScanMode.LINEART");
-#line 1534 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp4_;
-#line 1534 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12564 "scanner.c"
 		}
@@ -12575,13 +12575,13 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 		{
 			ScanMode _tmp5_ = 0;
 			gchar* _tmp6_ = NULL;
-#line 1536 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = mode;
-#line 1536 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = g_strdup_printf ("%d", (gint) _tmp5_);
-#line 1536 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp6_;
-#line 1536 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12578 "scanner.c"
 		}
@@ -12592,61 +12592,61 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 	gchar* result = NULL;
 	ScanType _tmp0_ = 0;
-#line 1540 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = type;
-#line 1542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp0_) {
-#line 1542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_SINGLE:
 #line 12595 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 1545 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp1_ = g_strdup ("ScanType.SINGLE");
-#line 1545 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp1_;
-#line 1545 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12604 "scanner.c"
 		}
-#line 1542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_FRONT:
 #line 12608 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 1547 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp2_ = g_strdup ("ScanType.ADF_FRONT");
-#line 1547 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp2_;
-#line 1547 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12617 "scanner.c"
 		}
-#line 1542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BACK:
 #line 12621 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 1549 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = g_strdup ("ScanType.ADF_BACK");
-#line 1549 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp3_;
-#line 1549 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12630 "scanner.c"
 		}
-#line 1542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BOTH:
 #line 12634 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
-#line 1551 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = g_strdup ("ScanType.ADF_BOTH");
-#line 1551 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp4_;
-#line 1551 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12643 "scanner.c"
 		}
@@ -12654,13 +12654,13 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 		{
 			ScanType _tmp5_ = 0;
 			gchar* _tmp6_ = NULL;
-#line 1553 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = type;
-#line 1553 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = g_strdup_printf ("%d", (gint) _tmp5_);
-#line 1553 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp6_;
-#line 1553 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12657 "scanner.c"
 		}
@@ -12725,173 +12725,173 @@ void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options) {
 	gint _tmp53_ = 0;
 	GAsyncQueue* _tmp54_ = NULL;
 	Request* _tmp55_ = NULL;
-#line 1557 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1557 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (options != NULL);
-#line 1560 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = device;
-#line 1560 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ != NULL) {
 #line 12728 "scanner.c"
 		const gchar* _tmp2_ = NULL;
-#line 1560 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = device;
-#line 1560 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
 #line 12734 "scanner.c"
 	} else {
-#line 1560 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = "(null)";
 #line 12738 "scanner.c"
 	}
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->dpi;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = _tmp5_->scan_mode;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = scanner_get_scan_mode_string (self, _tmp6_);
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = _tmp9_->depth;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = _tmp11_->type;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = scanner_get_scan_type_string (self, _tmp12_);
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = _tmp13_;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = _tmp15_->paper_width;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = _tmp17_->paper_height;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = _tmp19_->brightness;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = _tmp21_->contrast;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1559: Scanner.scan (\"%s\", dpi=%d, scan_mode=%s, depth=%" \
 "d, type=%s, paper_width=%d, paper_height=%d, brightness=%d, contrast=%" \
 "d)", _tmp0_, _tmp4_, _tmp8_, _tmp10_, _tmp14_, _tmp16_, _tmp18_, _tmp20_, _tmp22_);
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp14_);
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp8_);
-#line 1563 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = request_start_scan_new ();
-#line 1563 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request = _tmp23_;
-#line 1564 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = scan_job_new ();
-#line 1564 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (request->job);
-#line 1564 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request->job = _tmp24_;
-#line 1565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = request->job;
-#line 1565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = self->job_id;
-#line 1565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->job_id = _tmp26_ + 1;
-#line 1565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_->id = _tmp26_;
-#line 1566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = request->job;
-#line 1566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = device;
-#line 1566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = g_strdup (_tmp28_);
-#line 1566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp27_->device);
-#line 1566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_->device = _tmp29_;
-#line 1567 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = request->job;
-#line 1567 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = options;
-#line 1567 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp32_ = _tmp31_->dpi;
-#line 1567 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_->dpi = (gdouble) _tmp32_;
-#line 1568 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_ = request->job;
-#line 1568 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = options;
-#line 1568 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = _tmp34_->scan_mode;
-#line 1568 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_->scan_mode = _tmp35_;
-#line 1569 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = request->job;
-#line 1569 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_ = options;
-#line 1569 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = _tmp37_->depth;
-#line 1569 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_->depth = _tmp38_;
-#line 1570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = request->job;
-#line 1570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_ = options;
-#line 1570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = _tmp40_->type;
-#line 1570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_->type = _tmp41_;
-#line 1571 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = request->job;
-#line 1571 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = options;
-#line 1571 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = _tmp43_->paper_width;
-#line 1571 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_->page_width = _tmp44_;
-#line 1572 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp45_ = request->job;
-#line 1572 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp46_ = options;
-#line 1572 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp47_ = _tmp46_->paper_height;
-#line 1572 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp45_->page_height = _tmp47_;
-#line 1573 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp48_ = request->job;
-#line 1573 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp49_ = options;
-#line 1573 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp50_ = _tmp49_->brightness;
-#line 1573 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp48_->brightness = _tmp50_;
-#line 1574 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp51_ = request->job;
-#line 1574 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp52_ = options;
-#line 1574 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp53_ = _tmp52_->contrast;
-#line 1574 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp51_->contrast = _tmp53_;
-#line 1575 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp54_ = self->priv->request_queue;
-#line 1575 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp55_ = _request_ref0 ((Request*) request);
-#line 1575 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp54_, _tmp55_);
-#line 1557 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_request_unref0 (request);
 #line 12886 "scanner.c"
 }
@@ -12901,24 +12901,24 @@ void scanner_cancel (Scanner* self) {
 	gint _tmp0_ = 0;
 	GAsyncQueue* _tmp1_ = NULL;
 	RequestCancel* _tmp2_ = NULL;
-#line 1578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1580 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->job_id;
-#line 1580 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->first_job_id = _tmp0_;
-#line 1581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->request_queue;
-#line 1581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = request_cancel_new ();
-#line 1581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
 #line 12906 "scanner.c"
 }
 
 
 static gpointer _g_thread_ref0 (gpointer self) {
-#line 1592 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? g_thread_ref (self) : NULL;
 #line 12913 "scanner.c"
 }
@@ -12928,38 +12928,38 @@ void scanner_free (Scanner* self) {
 	GAsyncQueue* _tmp0_ = NULL;
 	RequestQuit* _tmp1_ = NULL;
 	GThread* _tmp2_ = NULL;
-#line 1584 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1586 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1586: Stopping scan thread");
-#line 1588 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->request_queue;
-#line 1588 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = request_quit_new ();
-#line 1588 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp0_, (Request*) _tmp1_);
-#line 1590 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->thread;
-#line 1590 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_ != NULL) {
 #line 12935 "scanner.c"
 		GThread* _tmp3_ = NULL;
 		GThread* _tmp4_ = NULL;
-#line 1592 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = self->priv->thread;
-#line 1592 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = _g_thread_ref0 (_tmp3_);
-#line 1592 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_thread_join (_tmp4_);
-#line 1593 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (self->priv->thread);
-#line 1593 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->thread = NULL;
 #line 12948 "scanner.c"
 	}
-#line 1596 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	sane_exit ();
-#line 1597 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1597: sane_exit ()");
 #line 12954 "scanner.c"
 }
@@ -12972,25 +12972,25 @@ static void g_cclosure_user_marshal_VOID__SCAN_PAGE_INFO (GClosure * closure, GV
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (n_param_values == 2);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = closure->data;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
 #line 12973 "scanner.c"
 	} else {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
 #line 12979 "scanner.c"
 	}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__SCAN_PAGE_INFO) (marshal_data ? marshal_data : cc->callback);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_page_info (param_values + 1), data2);
 #line 12985 "scanner.c"
 }
@@ -13003,25 +13003,25 @@ static void g_cclosure_user_marshal_VOID__SCAN_LINE (GClosure * closure, GValue
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (n_param_values == 2);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = closure->data;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
 #line 13004 "scanner.c"
 	} else {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
 #line 13010 "scanner.c"
 	}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__SCAN_LINE) (marshal_data ? marshal_data : cc->callback);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_line (param_values + 1), data2);
 #line 13016 "scanner.c"
 }
@@ -13034,41 +13034,41 @@ static void g_cclosure_user_marshal_VOID__INT_STRING (GClosure * closure, GValue
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = closure->data;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
 #line 13035 "scanner.c"
 	} else {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
 #line 13041 "scanner.c"
 	}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__INT_STRING) (marshal_data ? marshal_data : cc->callback);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_string (param_values + 2), data2);
 #line 13047 "scanner.c"
 }
 
 
 static void value_scanner_init (GValue* value) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 13054 "scanner.c"
 }
 
 
 static void value_scanner_free_value (GValue* value) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (value->data[0].v_pointer);
 #line 13063 "scanner.c"
 	}
@@ -13076,13 +13076,13 @@ static void value_scanner_free_value (GValue* value) {
 
 
 static void value_scanner_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scanner_ref (src_value->data[0].v_pointer);
 #line 13073 "scanner.c"
 	} else {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 13077 "scanner.c"
 	}
@@ -13090,37 +13090,37 @@ static void value_scanner_copy_value (const GValue* src_value, GValue* dest_valu
 
 
 static gpointer value_scanner_peek_pointer (const GValue* value) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 13085 "scanner.c"
 }
 
 
 static gchar* value_scanner_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 13092 "scanner.c"
 		Scanner* object;
 		object = collect_values[0].v_pointer;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 13099 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.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 13103 "scanner.c"
 		}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scanner_ref (object);
 #line 13107 "scanner.c"
 	} else {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 13111 "scanner.c"
 	}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 13115 "scanner.c"
 }
@@ -13129,27 +13129,27 @@ static gchar* value_scanner_collect_value (GValue* value, guint n_collect_values
 static gchar* value_scanner_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	Scanner** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 13126 "scanner.c"
 	}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 13132 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 13136 "scanner.c"
 	} else {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scanner_ref (value->data[0].v_pointer);
 #line 13140 "scanner.c"
 	}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 13144 "scanner.c"
 }
@@ -13157,22 +13157,22 @@ static gchar* value_scanner_lcopy_value (const GValue* value, guint n_collect_va
 
 GParamSpec* param_spec_scanner (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanner* spec;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCANNER), NULL);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 13158 "scanner.c"
 }
 
 
 gpointer value_get_scanner (const GValue* value) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCANNER), NULL);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 13167 "scanner.c"
 }
@@ -13180,29 +13180,29 @@ gpointer value_get_scanner (const GValue* value) {
 
 void value_set_scanner (GValue* value, gpointer v_object) {
 	Scanner* old;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCANNER));
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCANNER));
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_ref (value->data[0].v_pointer);
 #line 13187 "scanner.c"
 	} else {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 13191 "scanner.c"
 	}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
 #line 13197 "scanner.c"
 	}
@@ -13211,27 +13211,27 @@ void value_set_scanner (GValue* value, gpointer v_object) {
 
 void value_take_scanner (GValue* value, gpointer v_object) {
 	Scanner* old;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCANNER));
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCANNER));
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 13216 "scanner.c"
 	} else {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 13220 "scanner.c"
 	}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
 #line 13226 "scanner.c"
 	}
@@ -13239,38 +13239,38 @@ void value_take_scanner (GValue* value, gpointer v_object) {
 
 
 static void scanner_class_init (ScannerClass * klass) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_parent_class = g_type_class_peek_parent (klass);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((ScannerClass *) klass)->finalize = scanner_finalize;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (ScannerPrivate));
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("update_devices", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("request_authorization", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("expect_page", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("got_page_info", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SCAN_PAGE_INFO, G_TYPE_NONE, 1, TYPE_SCAN_PAGE_INFO);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("got_line", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SCAN_LINE, G_TYPE_NONE, 1, TYPE_SCAN_LINE);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("scan_failed", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_STRING, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_STRING);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("page_done", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("document_done", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("scanning_changed", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 13256 "scanner.c"
 }
 
 
 static void scanner_instance_init (Scanner * self) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = SCANNER_GET_PRIVATE (self);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 13265 "scanner.c"
 }
@@ -13278,27 +13278,27 @@ static void scanner_instance_init (Scanner * self) {
 
 static void scanner_finalize (Scanner* obj) {
 	Scanner * self;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCANNER, Scanner);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
-#line 214 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_thread_unref0 (self->priv->thread);
-#line 217 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->request_queue);
-#line 220 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->notify_queue);
-#line 223 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->authorize_queue);
-#line 229 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->default_device);
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_job_unref0_0 (self->priv->job_queue);
-#line 239 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_hash_table_unref0 (self->priv->options);
-#line 250 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
 #line 13293 "scanner.c"
 }
@@ -13321,9 +13321,9 @@ GType scanner_get_type (void) {
 gpointer scanner_ref (gpointer instance) {
 	Scanner* self;
 	self = instance;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 13318 "scanner.c"
 }
@@ -13332,11 +13332,11 @@ gpointer scanner_ref (gpointer instance) {
 void scanner_unref (gpointer instance) {
 	Scanner* self;
 	self = instance;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCANNER_GET_CLASS (self)->finalize (self);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 13331 "scanner.c"
 	}