Merge tag 'upstream/3.15.4'

Upstream version 3.15.4

1 files changed, 1174 insertions, 1162 deletions

diff --git a/src/scanner.c b/src/scanner.c
index 57323b2..0084b71 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -1,4 +1,4 @@
-/* scanner.c generated by valac 0.24.0, the Vala compiler
+/* scanner.c generated by valac 0.26.1, the Vala compiler
  * generated from scanner.vala, do not modify */
 
 /*
@@ -1176,7 +1176,7 @@ static void scan_device_class_init (ScanDeviceClass * klass) {
 #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/trunk/src/scanner.vala"
-	SCAN_DEVICE_CLASS (klass)->finalize = scan_device_finalize;
+	((ScanDeviceClass *) klass)->finalize = scan_device_finalize;
 #line 1181 "scanner.c"
 }
 
@@ -1192,11 +1192,13 @@ static void scan_device_finalize (ScanDevice* obj) {
 	ScanDevice * self;
 #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/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
 #line 16 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->name);
 #line 17 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->label);
-#line 1200 "scanner.c"
+#line 1202 "scanner.c"
 }
 
 
@@ -1221,7 +1223,7 @@ gpointer scan_device_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 1225 "scanner.c"
+#line 1227 "scanner.c"
 }
 
 
@@ -1234,7 +1236,7 @@ void scan_device_unref (gpointer instance) {
 		SCAN_DEVICE_GET_CLASS (self)->finalize (self);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1238 "scanner.c"
+#line 1240 "scanner.c"
 	}
 }
 
@@ -1245,21 +1247,21 @@ ScanPageInfo* scan_page_info_construct (GType object_type) {
 	self = (ScanPageInfo*) g_type_create_instance (object_type);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 1249 "scanner.c"
+#line 1251 "scanner.c"
 }
 
 
 ScanPageInfo* scan_page_info_new (void) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_page_info_construct (TYPE_SCAN_PAGE_INFO);
-#line 1256 "scanner.c"
+#line 1258 "scanner.c"
 }
 
 
 static void value_scan_page_info_init (GValue* value) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 1263 "scanner.c"
+#line 1265 "scanner.c"
 }
 
 
@@ -1268,7 +1270,7 @@ static void value_scan_page_info_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (value->data[0].v_pointer);
-#line 1272 "scanner.c"
+#line 1274 "scanner.c"
 	}
 }
 
@@ -1278,11 +1280,11 @@ static void value_scan_page_info_copy_value (const GValue* src_value, GValue* de
 	if (src_value->data[0].v_pointer) {
 #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 1282 "scanner.c"
+#line 1284 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1286 "scanner.c"
+#line 1288 "scanner.c"
 	}
 }
 
@@ -1290,37 +1292,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/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1294 "scanner.c"
+#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/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 1301 "scanner.c"
+#line 1303 "scanner.c"
 		ScanPageInfo* object;
 		object = collect_values[0].v_pointer;
 #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/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1308 "scanner.c"
+#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/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 1312 "scanner.c"
+#line 1314 "scanner.c"
 		}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_page_info_ref (object);
-#line 1316 "scanner.c"
+#line 1318 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1320 "scanner.c"
+#line 1322 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1324 "scanner.c"
+#line 1326 "scanner.c"
 }
 
 
@@ -1331,25 +1333,25 @@ static gchar* value_scan_page_info_lcopy_value (const GValue* value, guint n_col
 	if (!object_p) {
 #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 1335 "scanner.c"
+#line 1337 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 1341 "scanner.c"
+#line 1343 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1345 "scanner.c"
+#line 1347 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_page_info_ref (value->data[0].v_pointer);
-#line 1349 "scanner.c"
+#line 1351 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1353 "scanner.c"
+#line 1355 "scanner.c"
 }
 
 
@@ -1363,7 +1365,7 @@ GParamSpec* param_spec_scan_page_info (const gchar* name, const gchar* nick, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 1367 "scanner.c"
+#line 1369 "scanner.c"
 }
 
 
@@ -1372,7 +1374,7 @@ gpointer value_get_scan_page_info (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_PAGE_INFO), NULL);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1376 "scanner.c"
+#line 1378 "scanner.c"
 }
 
 
@@ -1392,17 +1394,17 @@ void value_set_scan_page_info (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_ref (value->data[0].v_pointer);
-#line 1396 "scanner.c"
+#line 1398 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1400 "scanner.c"
+#line 1402 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (old);
-#line 1406 "scanner.c"
+#line 1408 "scanner.c"
 	}
 }
 
@@ -1421,17 +1423,17 @@ void value_take_scan_page_info (GValue* value, gpointer v_object) {
 		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/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 1425 "scanner.c"
+#line 1427 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1429 "scanner.c"
+#line 1431 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (old);
-#line 1435 "scanner.c"
+#line 1437 "scanner.c"
 	}
 }
 
@@ -1440,15 +1442,15 @@ static void scan_page_info_class_init (ScanPageInfoClass * klass) {
 #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/trunk/src/scanner.vala"
-	SCAN_PAGE_INFO_CLASS (klass)->finalize = scan_page_info_finalize;
-#line 1445 "scanner.c"
+	((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/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 1452 "scanner.c"
+#line 1454 "scanner.c"
 }
 
 
@@ -1456,9 +1458,11 @@ static void scan_page_info_finalize (ScanPageInfo* obj) {
 	ScanPageInfo * self;
 #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/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
 #line 36 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->device);
-#line 1462 "scanner.c"
+#line 1466 "scanner.c"
 }
 
 
@@ -1483,7 +1487,7 @@ gpointer scan_page_info_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 1487 "scanner.c"
+#line 1491 "scanner.c"
 }
 
 
@@ -1496,7 +1500,7 @@ void scan_page_info_unref (gpointer instance) {
 		SCAN_PAGE_INFO_GET_CLASS (self)->finalize (self);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1500 "scanner.c"
+#line 1504 "scanner.c"
 	}
 }
 
@@ -1507,21 +1511,21 @@ ScanLine* scan_line_construct (GType object_type) {
 	self = (ScanLine*) g_type_create_instance (object_type);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 1511 "scanner.c"
+#line 1515 "scanner.c"
 }
 
 
 ScanLine* scan_line_new (void) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_line_construct (TYPE_SCAN_LINE);
-#line 1518 "scanner.c"
+#line 1522 "scanner.c"
 }
 
 
 static void value_scan_line_init (GValue* value) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 1525 "scanner.c"
+#line 1529 "scanner.c"
 }
 
 
@@ -1530,7 +1534,7 @@ static void value_scan_line_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (value->data[0].v_pointer);
-#line 1534 "scanner.c"
+#line 1538 "scanner.c"
 	}
 }
 
@@ -1540,11 +1544,11 @@ static void value_scan_line_copy_value (const GValue* src_value, GValue* dest_va
 	if (src_value->data[0].v_pointer) {
 #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 1544 "scanner.c"
+#line 1548 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1548 "scanner.c"
+#line 1552 "scanner.c"
 	}
 }
 
@@ -1552,37 +1556,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/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1556 "scanner.c"
+#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/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 1563 "scanner.c"
+#line 1567 "scanner.c"
 		ScanLine* object;
 		object = collect_values[0].v_pointer;
 #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/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1570 "scanner.c"
+#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/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 1574 "scanner.c"
+#line 1578 "scanner.c"
 		}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_line_ref (object);
-#line 1578 "scanner.c"
+#line 1582 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1582 "scanner.c"
+#line 1586 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1586 "scanner.c"
+#line 1590 "scanner.c"
 }
 
 
@@ -1593,25 +1597,25 @@ static gchar* value_scan_line_lcopy_value (const GValue* value, guint n_collect_
 	if (!object_p) {
 #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 1597 "scanner.c"
+#line 1601 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 1603 "scanner.c"
+#line 1607 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1607 "scanner.c"
+#line 1611 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_line_ref (value->data[0].v_pointer);
-#line 1611 "scanner.c"
+#line 1615 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1615 "scanner.c"
+#line 1619 "scanner.c"
 }
 
 
@@ -1625,7 +1629,7 @@ GParamSpec* param_spec_scan_line (const gchar* name, const gchar* nick, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 1629 "scanner.c"
+#line 1633 "scanner.c"
 }
 
 
@@ -1634,7 +1638,7 @@ gpointer value_get_scan_line (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_LINE), NULL);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1638 "scanner.c"
+#line 1642 "scanner.c"
 }
 
 
@@ -1654,17 +1658,17 @@ void value_set_scan_line (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_ref (value->data[0].v_pointer);
-#line 1658 "scanner.c"
+#line 1662 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1662 "scanner.c"
+#line 1666 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (old);
-#line 1668 "scanner.c"
+#line 1672 "scanner.c"
 	}
 }
 
@@ -1683,17 +1687,17 @@ void value_take_scan_line (GValue* value, gpointer v_object) {
 		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/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 1687 "scanner.c"
+#line 1691 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1691 "scanner.c"
+#line 1695 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (old);
-#line 1697 "scanner.c"
+#line 1701 "scanner.c"
 	}
 }
 
@@ -1702,15 +1706,15 @@ static void scan_line_class_init (ScanLineClass * klass) {
 #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/trunk/src/scanner.vala"
-	SCAN_LINE_CLASS (klass)->finalize = scan_line_finalize;
-#line 1707 "scanner.c"
+	((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/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 1714 "scanner.c"
+#line 1718 "scanner.c"
 }
 
 
@@ -1718,9 +1722,11 @@ static void scan_line_finalize (ScanLine* obj) {
 	ScanLine * self;
 #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/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
 #line 55 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->data = (g_free (self->data), NULL);
-#line 1724 "scanner.c"
+#line 1730 "scanner.c"
 }
 
 
@@ -1745,7 +1751,7 @@ gpointer scan_line_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 1749 "scanner.c"
+#line 1755 "scanner.c"
 }
 
 
@@ -1758,7 +1764,7 @@ void scan_line_unref (gpointer instance) {
 		SCAN_LINE_GET_CLASS (self)->finalize (self);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1762 "scanner.c"
+#line 1768 "scanner.c"
 	}
 }
 
@@ -1793,21 +1799,21 @@ ScanOptions* scan_options_construct (GType object_type) {
 	self = (ScanOptions*) g_type_create_instance (object_type);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 1797 "scanner.c"
+#line 1803 "scanner.c"
 }
 
 
 ScanOptions* scan_options_new (void) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_options_construct (TYPE_SCAN_OPTIONS);
-#line 1804 "scanner.c"
+#line 1810 "scanner.c"
 }
 
 
 static void value_scan_options_init (GValue* value) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 1811 "scanner.c"
+#line 1817 "scanner.c"
 }
 
 
@@ -1816,7 +1822,7 @@ static void value_scan_options_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (value->data[0].v_pointer);
-#line 1820 "scanner.c"
+#line 1826 "scanner.c"
 	}
 }
 
@@ -1826,11 +1832,11 @@ static void value_scan_options_copy_value (const GValue* src_value, GValue* dest
 	if (src_value->data[0].v_pointer) {
 #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 1830 "scanner.c"
+#line 1836 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1834 "scanner.c"
+#line 1840 "scanner.c"
 	}
 }
 
@@ -1838,37 +1844,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/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1842 "scanner.c"
+#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/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 1849 "scanner.c"
+#line 1855 "scanner.c"
 		ScanOptions* object;
 		object = collect_values[0].v_pointer;
 #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/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1856 "scanner.c"
+#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/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 1860 "scanner.c"
+#line 1866 "scanner.c"
 		}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_options_ref (object);
-#line 1864 "scanner.c"
+#line 1870 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1868 "scanner.c"
+#line 1874 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1872 "scanner.c"
+#line 1878 "scanner.c"
 }
 
 
@@ -1879,25 +1885,25 @@ static gchar* value_scan_options_lcopy_value (const GValue* value, guint n_colle
 	if (!object_p) {
 #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 1883 "scanner.c"
+#line 1889 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 1889 "scanner.c"
+#line 1895 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1893 "scanner.c"
+#line 1899 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_options_ref (value->data[0].v_pointer);
-#line 1897 "scanner.c"
+#line 1903 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1901 "scanner.c"
+#line 1907 "scanner.c"
 }
 
 
@@ -1911,7 +1917,7 @@ GParamSpec* param_spec_scan_options (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 1915 "scanner.c"
+#line 1921 "scanner.c"
 }
 
 
@@ -1920,7 +1926,7 @@ gpointer value_get_scan_options (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_OPTIONS), NULL);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1924 "scanner.c"
+#line 1930 "scanner.c"
 }
 
 
@@ -1940,17 +1946,17 @@ void value_set_scan_options (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_ref (value->data[0].v_pointer);
-#line 1944 "scanner.c"
+#line 1950 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1948 "scanner.c"
+#line 1954 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (old);
-#line 1954 "scanner.c"
+#line 1960 "scanner.c"
 	}
 }
 
@@ -1969,17 +1975,17 @@ void value_take_scan_options (GValue* value, gpointer v_object) {
 		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/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 1973 "scanner.c"
+#line 1979 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1977 "scanner.c"
+#line 1983 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (old);
-#line 1983 "scanner.c"
+#line 1989 "scanner.c"
 	}
 }
 
@@ -1988,15 +1994,15 @@ static void scan_options_class_init (ScanOptionsClass * klass) {
 #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/trunk/src/scanner.vala"
-	SCAN_OPTIONS_CLASS (klass)->finalize = scan_options_finalize;
-#line 1993 "scanner.c"
+	((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/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 2000 "scanner.c"
+#line 2006 "scanner.c"
 }
 
 
@@ -2004,7 +2010,9 @@ static void scan_options_finalize (ScanOptions* obj) {
 	ScanOptions * self;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_OPTIONS, ScanOptions);
-#line 2008 "scanner.c"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
+#line 2016 "scanner.c"
 }
 
 
@@ -2029,7 +2037,7 @@ gpointer scan_options_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 2033 "scanner.c"
+#line 2041 "scanner.c"
 }
 
 
@@ -2042,7 +2050,7 @@ void scan_options_unref (gpointer instance) {
 		SCAN_OPTIONS_GET_CLASS (self)->finalize (self);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2046 "scanner.c"
+#line 2054 "scanner.c"
 	}
 }
 
@@ -2053,21 +2061,21 @@ ScanJob* scan_job_construct (GType object_type) {
 	self = (ScanJob*) g_type_create_instance (object_type);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2057 "scanner.c"
+#line 2065 "scanner.c"
 }
 
 
 ScanJob* scan_job_new (void) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_job_construct (TYPE_SCAN_JOB);
-#line 2064 "scanner.c"
+#line 2072 "scanner.c"
 }
 
 
 static void value_scan_job_init (GValue* value) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 2071 "scanner.c"
+#line 2079 "scanner.c"
 }
 
 
@@ -2076,7 +2084,7 @@ static void value_scan_job_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (value->data[0].v_pointer);
-#line 2080 "scanner.c"
+#line 2088 "scanner.c"
 	}
 }
 
@@ -2086,11 +2094,11 @@ static void value_scan_job_copy_value (const GValue* src_value, GValue* dest_val
 	if (src_value->data[0].v_pointer) {
 #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 2090 "scanner.c"
+#line 2098 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2094 "scanner.c"
+#line 2102 "scanner.c"
 	}
 }
 
@@ -2098,37 +2106,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/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2102 "scanner.c"
+#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/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 2109 "scanner.c"
+#line 2117 "scanner.c"
 		ScanJob* object;
 		object = collect_values[0].v_pointer;
 #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/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2116 "scanner.c"
+#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/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 2120 "scanner.c"
+#line 2128 "scanner.c"
 		}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_job_ref (object);
-#line 2124 "scanner.c"
+#line 2132 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2128 "scanner.c"
+#line 2136 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2132 "scanner.c"
+#line 2140 "scanner.c"
 }
 
 
@@ -2139,25 +2147,25 @@ static gchar* value_scan_job_lcopy_value (const GValue* value, guint n_collect_v
 	if (!object_p) {
 #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 2143 "scanner.c"
+#line 2151 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 2149 "scanner.c"
+#line 2157 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2153 "scanner.c"
+#line 2161 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_job_ref (value->data[0].v_pointer);
-#line 2157 "scanner.c"
+#line 2165 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2161 "scanner.c"
+#line 2169 "scanner.c"
 }
 
 
@@ -2171,7 +2179,7 @@ GParamSpec* param_spec_scan_job (const gchar* name, const gchar* nick, const gch
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 2175 "scanner.c"
+#line 2183 "scanner.c"
 }
 
 
@@ -2180,7 +2188,7 @@ gpointer value_get_scan_job (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_JOB), NULL);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2184 "scanner.c"
+#line 2192 "scanner.c"
 }
 
 
@@ -2200,17 +2208,17 @@ void value_set_scan_job (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_ref (value->data[0].v_pointer);
-#line 2204 "scanner.c"
+#line 2212 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2208 "scanner.c"
+#line 2216 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (old);
-#line 2214 "scanner.c"
+#line 2222 "scanner.c"
 	}
 }
 
@@ -2229,17 +2237,17 @@ void value_take_scan_job (GValue* value, gpointer v_object) {
 		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/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 2233 "scanner.c"
+#line 2241 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2237 "scanner.c"
+#line 2245 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (old);
-#line 2243 "scanner.c"
+#line 2251 "scanner.c"
 	}
 }
 
@@ -2248,15 +2256,15 @@ static void scan_job_class_init (ScanJobClass * klass) {
 #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/trunk/src/scanner.vala"
-	SCAN_JOB_CLASS (klass)->finalize = scan_job_finalize;
-#line 2253 "scanner.c"
+	((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/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 2260 "scanner.c"
+#line 2268 "scanner.c"
 }
 
 
@@ -2264,9 +2272,11 @@ static void scan_job_finalize (ScanJob* obj) {
 	ScanJob * self;
 #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/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
 #line 90 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->device);
-#line 2270 "scanner.c"
+#line 2280 "scanner.c"
 }
 
 
@@ -2291,7 +2301,7 @@ gpointer scan_job_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 2295 "scanner.c"
+#line 2305 "scanner.c"
 }
 
 
@@ -2304,7 +2314,7 @@ void scan_job_unref (gpointer instance) {
 		SCAN_JOB_GET_CLASS (self)->finalize (self);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2308 "scanner.c"
+#line 2318 "scanner.c"
 	}
 }
 
@@ -2315,21 +2325,21 @@ Request* request_construct (GType object_type) {
 	self = (Request*) g_type_create_instance (object_type);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2319 "scanner.c"
+#line 2329 "scanner.c"
 }
 
 
 Request* request_new (void) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_construct (TYPE_REQUEST);
-#line 2326 "scanner.c"
+#line 2336 "scanner.c"
 }
 
 
 static void value_request_init (GValue* value) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 2333 "scanner.c"
+#line 2343 "scanner.c"
 }
 
 
@@ -2338,7 +2348,7 @@ static void value_request_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (value->data[0].v_pointer);
-#line 2342 "scanner.c"
+#line 2352 "scanner.c"
 	}
 }
 
@@ -2348,11 +2358,11 @@ static void value_request_copy_value (const GValue* src_value, GValue* dest_valu
 	if (src_value->data[0].v_pointer) {
 #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 2352 "scanner.c"
+#line 2362 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2356 "scanner.c"
+#line 2366 "scanner.c"
 	}
 }
 
@@ -2360,37 +2370,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/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2364 "scanner.c"
+#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/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 2371 "scanner.c"
+#line 2381 "scanner.c"
 		Request* object;
 		object = collect_values[0].v_pointer;
 #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/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2378 "scanner.c"
+#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/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 2382 "scanner.c"
+#line 2392 "scanner.c"
 		}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = request_ref (object);
-#line 2386 "scanner.c"
+#line 2396 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2390 "scanner.c"
+#line 2400 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2394 "scanner.c"
+#line 2404 "scanner.c"
 }
 
 
@@ -2401,25 +2411,25 @@ static gchar* value_request_lcopy_value (const GValue* value, guint n_collect_va
 	if (!object_p) {
 #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 2405 "scanner.c"
+#line 2415 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 2411 "scanner.c"
+#line 2421 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2415 "scanner.c"
+#line 2425 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = request_ref (value->data[0].v_pointer);
-#line 2419 "scanner.c"
+#line 2429 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2423 "scanner.c"
+#line 2433 "scanner.c"
 }
 
 
@@ -2433,7 +2443,7 @@ GParamSpec* param_spec_request (const gchar* name, const gchar* nick, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 2437 "scanner.c"
+#line 2447 "scanner.c"
 }
 
 
@@ -2442,7 +2452,7 @@ gpointer value_get_request (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_REQUEST), NULL);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2446 "scanner.c"
+#line 2456 "scanner.c"
 }
 
 
@@ -2462,17 +2472,17 @@ void value_set_request (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_ref (value->data[0].v_pointer);
-#line 2466 "scanner.c"
+#line 2476 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2470 "scanner.c"
+#line 2480 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (old);
-#line 2476 "scanner.c"
+#line 2486 "scanner.c"
 	}
 }
 
@@ -2491,17 +2501,17 @@ void value_take_request (GValue* value, gpointer v_object) {
 		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/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 2495 "scanner.c"
+#line 2505 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2499 "scanner.c"
+#line 2509 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (old);
-#line 2505 "scanner.c"
+#line 2515 "scanner.c"
 	}
 }
 
@@ -2510,15 +2520,15 @@ static void request_class_init (RequestClass * klass) {
 #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/trunk/src/scanner.vala"
-	REQUEST_CLASS (klass)->finalize = request_finalize;
-#line 2515 "scanner.c"
+	((RequestClass *) klass)->finalize = request_finalize;
+#line 2525 "scanner.c"
 }
 
 
 static void request_instance_init (Request * self) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 2522 "scanner.c"
+#line 2532 "scanner.c"
 }
 
 
@@ -2526,7 +2536,9 @@ static void request_finalize (Request* obj) {
 	Request * self;
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_REQUEST, Request);
-#line 2530 "scanner.c"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
+#line 2542 "scanner.c"
 }
 
 
@@ -2551,7 +2563,7 @@ gpointer request_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 2555 "scanner.c"
+#line 2567 "scanner.c"
 }
 
 
@@ -2564,7 +2576,7 @@ void request_unref (gpointer instance) {
 		REQUEST_GET_CLASS (self)->finalize (self);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2568 "scanner.c"
+#line 2580 "scanner.c"
 	}
 }
 
@@ -2575,21 +2587,21 @@ RequestRedetect* request_redetect_construct (GType object_type) {
 	self = (RequestRedetect*) request_construct (object_type);
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2579 "scanner.c"
+#line 2591 "scanner.c"
 }
 
 
 RequestRedetect* request_redetect_new (void) {
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_redetect_construct (TYPE_REQUEST_REDETECT);
-#line 2586 "scanner.c"
+#line 2598 "scanner.c"
 }
 
 
 static void request_redetect_class_init (RequestRedetectClass * klass) {
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_redetect_parent_class = g_type_class_peek_parent (klass);
-#line 2593 "scanner.c"
+#line 2605 "scanner.c"
 }
 
 
@@ -2615,21 +2627,21 @@ RequestCancel* request_cancel_construct (GType object_type) {
 	self = (RequestCancel*) request_construct (object_type);
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2619 "scanner.c"
+#line 2631 "scanner.c"
 }
 
 
 RequestCancel* request_cancel_new (void) {
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_cancel_construct (TYPE_REQUEST_CANCEL);
-#line 2626 "scanner.c"
+#line 2638 "scanner.c"
 }
 
 
 static void request_cancel_class_init (RequestCancelClass * klass) {
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_cancel_parent_class = g_type_class_peek_parent (klass);
-#line 2633 "scanner.c"
+#line 2645 "scanner.c"
 }
 
 
@@ -2655,14 +2667,14 @@ RequestStartScan* request_start_scan_construct (GType object_type) {
 	self = (RequestStartScan*) request_construct (object_type);
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2659 "scanner.c"
+#line 2671 "scanner.c"
 }
 
 
 RequestStartScan* request_start_scan_new (void) {
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_start_scan_construct (TYPE_REQUEST_START_SCAN);
-#line 2666 "scanner.c"
+#line 2678 "scanner.c"
 }
 
 
@@ -2670,8 +2682,8 @@ static void request_start_scan_class_init (RequestStartScanClass * klass) {
 #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/trunk/src/scanner.vala"
-	REQUEST_CLASS (klass)->finalize = request_start_scan_finalize;
-#line 2675 "scanner.c"
+	((RequestClass *) klass)->finalize = request_start_scan_finalize;
+#line 2687 "scanner.c"
 }
 
 
@@ -2687,7 +2699,7 @@ static void request_start_scan_finalize (Request* obj) {
 	_scan_job_unref0 (self->job);
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	REQUEST_CLASS (request_start_scan_parent_class)->finalize (obj);
-#line 2691 "scanner.c"
+#line 2703 "scanner.c"
 }
 
 
@@ -2709,21 +2721,21 @@ RequestQuit* request_quit_construct (GType object_type) {
 	self = (RequestQuit*) request_construct (object_type);
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2713 "scanner.c"
+#line 2725 "scanner.c"
 }
 
 
 RequestQuit* request_quit_new (void) {
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_quit_construct (TYPE_REQUEST_QUIT);
-#line 2720 "scanner.c"
+#line 2732 "scanner.c"
 }
 
 
 static void request_quit_class_init (RequestQuitClass * klass) {
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_quit_parent_class = g_type_class_peek_parent (klass);
-#line 2727 "scanner.c"
+#line 2739 "scanner.c"
 }
 
 
@@ -2749,21 +2761,21 @@ Credentials* credentials_construct (GType object_type) {
 	self = (Credentials*) g_type_create_instance (object_type);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2753 "scanner.c"
+#line 2765 "scanner.c"
 }
 
 
 Credentials* credentials_new (void) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return credentials_construct (TYPE_CREDENTIALS);
-#line 2760 "scanner.c"
+#line 2772 "scanner.c"
 }
 
 
 static void value_credentials_init (GValue* value) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 2767 "scanner.c"
+#line 2779 "scanner.c"
 }
 
 
@@ -2772,7 +2784,7 @@ static void value_credentials_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (value->data[0].v_pointer);
-#line 2776 "scanner.c"
+#line 2788 "scanner.c"
 	}
 }
 
@@ -2782,11 +2794,11 @@ static void value_credentials_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #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 2786 "scanner.c"
+#line 2798 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2790 "scanner.c"
+#line 2802 "scanner.c"
 	}
 }
 
@@ -2794,37 +2806,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/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2798 "scanner.c"
+#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/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 2805 "scanner.c"
+#line 2817 "scanner.c"
 		Credentials* object;
 		object = collect_values[0].v_pointer;
 #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/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2812 "scanner.c"
+#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/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 2816 "scanner.c"
+#line 2828 "scanner.c"
 		}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = credentials_ref (object);
-#line 2820 "scanner.c"
+#line 2832 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2824 "scanner.c"
+#line 2836 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2828 "scanner.c"
+#line 2840 "scanner.c"
 }
 
 
@@ -2835,25 +2847,25 @@ static gchar* value_credentials_lcopy_value (const GValue* value, guint n_collec
 	if (!object_p) {
 #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 2839 "scanner.c"
+#line 2851 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 2845 "scanner.c"
+#line 2857 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2849 "scanner.c"
+#line 2861 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = credentials_ref (value->data[0].v_pointer);
-#line 2853 "scanner.c"
+#line 2865 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2857 "scanner.c"
+#line 2869 "scanner.c"
 }
 
 
@@ -2867,7 +2879,7 @@ GParamSpec* param_spec_credentials (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 2871 "scanner.c"
+#line 2883 "scanner.c"
 }
 
 
@@ -2876,7 +2888,7 @@ gpointer value_get_credentials (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CREDENTIALS), NULL);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2880 "scanner.c"
+#line 2892 "scanner.c"
 }
 
 
@@ -2896,17 +2908,17 @@ void value_set_credentials (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_ref (value->data[0].v_pointer);
-#line 2900 "scanner.c"
+#line 2912 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2904 "scanner.c"
+#line 2916 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (old);
-#line 2910 "scanner.c"
+#line 2922 "scanner.c"
 	}
 }
 
@@ -2925,17 +2937,17 @@ void value_take_credentials (GValue* value, gpointer v_object) {
 		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/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 2929 "scanner.c"
+#line 2941 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2933 "scanner.c"
+#line 2945 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (old);
-#line 2939 "scanner.c"
+#line 2951 "scanner.c"
 	}
 }
 
@@ -2944,15 +2956,15 @@ static void credentials_class_init (CredentialsClass * klass) {
 #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/trunk/src/scanner.vala"
-	CREDENTIALS_CLASS (klass)->finalize = credentials_finalize;
-#line 2949 "scanner.c"
+	((CredentialsClass *) klass)->finalize = credentials_finalize;
+#line 2961 "scanner.c"
 }
 
 
 static void credentials_instance_init (Credentials * self) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 2956 "scanner.c"
+#line 2968 "scanner.c"
 }
 
 
@@ -2960,11 +2972,13 @@ static void credentials_finalize (Credentials* obj) {
 	Credentials * self;
 #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/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->username);
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->password);
-#line 2968 "scanner.c"
+#line 2982 "scanner.c"
 }
 
 
@@ -2989,7 +3003,7 @@ gpointer credentials_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 2993 "scanner.c"
+#line 3007 "scanner.c"
 }
 
 
@@ -3002,7 +3016,7 @@ void credentials_unref (gpointer instance) {
 		CREDENTIALS_GET_CLASS (self)->finalize (self);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3006 "scanner.c"
+#line 3020 "scanner.c"
 	}
 }
 
@@ -3022,7 +3036,7 @@ GType scan_state_get_type (void) {
 static void notify_real_run (Notify* self, Scanner* scanner) {
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 3026 "scanner.c"
+#line 3040 "scanner.c"
 }
 
 
@@ -3031,7 +3045,7 @@ void notify_run (Notify* self, Scanner* scanner) {
 	g_return_if_fail (self != NULL);
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_GET_CLASS (self)->run (self, scanner);
-#line 3035 "scanner.c"
+#line 3049 "scanner.c"
 }
 
 
@@ -3041,21 +3055,21 @@ Notify* notify_construct (GType object_type) {
 	self = (Notify*) g_type_create_instance (object_type);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3045 "scanner.c"
+#line 3059 "scanner.c"
 }
 
 
 Notify* notify_new (void) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_construct (TYPE_NOTIFY);
-#line 3052 "scanner.c"
+#line 3066 "scanner.c"
 }
 
 
 static void value_notify_init (GValue* value) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 3059 "scanner.c"
+#line 3073 "scanner.c"
 }
 
 
@@ -3064,7 +3078,7 @@ static void value_notify_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (value->data[0].v_pointer);
-#line 3068 "scanner.c"
+#line 3082 "scanner.c"
 	}
 }
 
@@ -3074,11 +3088,11 @@ static void value_notify_copy_value (const GValue* src_value, GValue* dest_value
 	if (src_value->data[0].v_pointer) {
 #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 3078 "scanner.c"
+#line 3092 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3082 "scanner.c"
+#line 3096 "scanner.c"
 	}
 }
 
@@ -3086,37 +3100,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/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 3090 "scanner.c"
+#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/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 3097 "scanner.c"
+#line 3111 "scanner.c"
 		Notify* object;
 		object = collect_values[0].v_pointer;
 #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/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3104 "scanner.c"
+#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/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 3108 "scanner.c"
+#line 3122 "scanner.c"
 		}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = notify_ref (object);
-#line 3112 "scanner.c"
+#line 3126 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 3116 "scanner.c"
+#line 3130 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 3120 "scanner.c"
+#line 3134 "scanner.c"
 }
 
 
@@ -3127,25 +3141,25 @@ static gchar* value_notify_lcopy_value (const GValue* value, guint n_collect_val
 	if (!object_p) {
 #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 3131 "scanner.c"
+#line 3145 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 3137 "scanner.c"
+#line 3151 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3141 "scanner.c"
+#line 3155 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = notify_ref (value->data[0].v_pointer);
-#line 3145 "scanner.c"
+#line 3159 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 3149 "scanner.c"
+#line 3163 "scanner.c"
 }
 
 
@@ -3159,7 +3173,7 @@ GParamSpec* param_spec_notify (const gchar* name, const gchar* nick, const gchar
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 3163 "scanner.c"
+#line 3177 "scanner.c"
 }
 
 
@@ -3168,7 +3182,7 @@ gpointer value_get_notify (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFY), NULL);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 3172 "scanner.c"
+#line 3186 "scanner.c"
 }
 
 
@@ -3188,17 +3202,17 @@ void value_set_notify (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_ref (value->data[0].v_pointer);
-#line 3192 "scanner.c"
+#line 3206 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 3196 "scanner.c"
+#line 3210 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (old);
-#line 3202 "scanner.c"
+#line 3216 "scanner.c"
 	}
 }
 
@@ -3217,17 +3231,17 @@ void value_take_notify (GValue* value, gpointer v_object) {
 		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/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 3221 "scanner.c"
+#line 3235 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 3225 "scanner.c"
+#line 3239 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (old);
-#line 3231 "scanner.c"
+#line 3245 "scanner.c"
 	}
 }
 
@@ -3236,17 +3250,17 @@ static void notify_class_init (NotifyClass * klass) {
 #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/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->finalize = notify_finalize;
+	((NotifyClass *) klass)->finalize = notify_finalize;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_real_run;
-#line 3243 "scanner.c"
+	((NotifyClass *) klass)->run = notify_real_run;
+#line 3257 "scanner.c"
 }
 
 
 static void notify_instance_init (Notify * self) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 3250 "scanner.c"
+#line 3264 "scanner.c"
 }
 
 
@@ -3254,7 +3268,9 @@ static void notify_finalize (Notify* obj) {
 	Notify * self;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY, Notify);
-#line 3258 "scanner.c"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
+#line 3274 "scanner.c"
 }
 
 
@@ -3279,7 +3295,7 @@ gpointer notify_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 3283 "scanner.c"
+#line 3299 "scanner.c"
 }
 
 
@@ -3292,7 +3308,7 @@ void notify_unref (gpointer instance) {
 		NOTIFY_GET_CLASS (self)->finalize (self);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3296 "scanner.c"
+#line 3312 "scanner.c"
 	}
 }
 
@@ -3308,7 +3324,7 @@ static void notify_scanning_changed_real_run (Notify* base, Scanner* scanner) {
 	_tmp0_ = scanner;
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "scanning-changed");
-#line 3312 "scanner.c"
+#line 3328 "scanner.c"
 }
 
 
@@ -3318,14 +3334,14 @@ NotifyScanningChanged* notify_scanning_changed_construct (GType object_type) {
 	self = (NotifyScanningChanged*) notify_construct (object_type);
 #line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3322 "scanner.c"
+#line 3338 "scanner.c"
 }
 
 
 NotifyScanningChanged* notify_scanning_changed_new (void) {
 #line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_scanning_changed_construct (TYPE_NOTIFY_SCANNING_CHANGED);
-#line 3329 "scanner.c"
+#line 3345 "scanner.c"
 }
 
 
@@ -3333,8 +3349,8 @@ static void notify_scanning_changed_class_init (NotifyScanningChangedClass * kla
 #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/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_scanning_changed_real_run;
-#line 3338 "scanner.c"
+	((NotifyClass *) klass)->run = notify_scanning_changed_real_run;
+#line 3354 "scanner.c"
 }
 
 
@@ -3357,7 +3373,7 @@ GType notify_scanning_changed_get_type (void) {
 static void _scan_device_unref0_ (gpointer var) {
 #line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (scan_device_unref (var), NULL));
-#line 3361 "scanner.c"
+#line 3377 "scanner.c"
 }
 
 
@@ -3366,7 +3382,7 @@ static void _g_list_free__scan_device_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _scan_device_unref0_, NULL);
 #line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_free (self);
-#line 3370 "scanner.c"
+#line 3386 "scanner.c"
 }
 
 
@@ -3387,14 +3403,14 @@ NotifyUpdateDevices* notify_update_devices_construct (GType object_type, GList*
 	__g_list_free__scan_device_unref0_0 (devices);
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3391 "scanner.c"
+#line 3407 "scanner.c"
 }
 
 
 NotifyUpdateDevices* notify_update_devices_new (GList* devices) {
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_update_devices_construct (TYPE_NOTIFY_UPDATE_DEVICES, devices);
-#line 3398 "scanner.c"
+#line 3414 "scanner.c"
 }
 
 
@@ -3412,7 +3428,7 @@ static void notify_update_devices_real_run (Notify* base, Scanner* scanner) {
 	_tmp1_ = self->priv->devices;
 #line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "update-devices", _tmp1_);
-#line 3416 "scanner.c"
+#line 3432 "scanner.c"
 }
 
 
@@ -3420,19 +3436,19 @@ static void notify_update_devices_class_init (NotifyUpdateDevicesClass * klass)
 #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/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->finalize = notify_update_devices_finalize;
+	((NotifyClass *) klass)->finalize = notify_update_devices_finalize;
 #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/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_update_devices_real_run;
-#line 3429 "scanner.c"
+	((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/trunk/src/scanner.vala"
 	self->priv = NOTIFY_UPDATE_DEVICES_GET_PRIVATE (self);
-#line 3436 "scanner.c"
+#line 3452 "scanner.c"
 }
 
 
@@ -3444,7 +3460,7 @@ static void notify_update_devices_finalize (Notify* obj) {
 	__g_list_free__scan_device_unref0_0 (self->priv->devices);
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_update_devices_parent_class)->finalize (obj);
-#line 3448 "scanner.c"
+#line 3464 "scanner.c"
 }
 
 
@@ -3478,14 +3494,14 @@ NotifyRequestAuthorization* notify_request_authorization_construct (GType object
 	self->priv->resource = _tmp1_;
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3482 "scanner.c"
+#line 3498 "scanner.c"
 }
 
 
 NotifyRequestAuthorization* notify_request_authorization_new (const gchar* resource) {
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_request_authorization_construct (TYPE_NOTIFY_REQUEST_AUTHORIZATION, resource);
-#line 3489 "scanner.c"
+#line 3505 "scanner.c"
 }
 
 
@@ -3503,7 +3519,7 @@ static void notify_request_authorization_real_run (Notify* base, Scanner* scanne
 	_tmp1_ = self->priv->resource;
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "request-authorization", _tmp1_);
-#line 3507 "scanner.c"
+#line 3523 "scanner.c"
 }
 
 
@@ -3511,19 +3527,19 @@ static void notify_request_authorization_class_init (NotifyRequestAuthorizationC
 #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/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->finalize = notify_request_authorization_finalize;
+	((NotifyClass *) klass)->finalize = notify_request_authorization_finalize;
 #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/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_request_authorization_real_run;
-#line 3520 "scanner.c"
+	((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/trunk/src/scanner.vala"
 	self->priv = NOTIFY_REQUEST_AUTHORIZATION_GET_PRIVATE (self);
-#line 3527 "scanner.c"
+#line 3543 "scanner.c"
 }
 
 
@@ -3535,7 +3551,7 @@ static void notify_request_authorization_finalize (Notify* obj) {
 	_g_free0 (self->priv->resource);
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_request_authorization_parent_class)->finalize (obj);
-#line 3539 "scanner.c"
+#line 3555 "scanner.c"
 }
 
 
@@ -3574,14 +3590,14 @@ NotifyScanFailed* notify_scan_failed_construct (GType object_type, gint error_co
 	self->priv->error_string = _tmp2_;
 #line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3578 "scanner.c"
+#line 3594 "scanner.c"
 }
 
 
 NotifyScanFailed* notify_scan_failed_new (gint error_code, const gchar* error_string) {
 #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 3585 "scanner.c"
+#line 3601 "scanner.c"
 }
 
 
@@ -3602,7 +3618,7 @@ static void notify_scan_failed_real_run (Notify* base, Scanner* scanner) {
 	_tmp2_ = self->priv->error_string;
 #line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "scan-failed", _tmp1_, _tmp2_);
-#line 3606 "scanner.c"
+#line 3622 "scanner.c"
 }
 
 
@@ -3610,19 +3626,19 @@ static void notify_scan_failed_class_init (NotifyScanFailedClass * klass) {
 #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/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->finalize = notify_scan_failed_finalize;
+	((NotifyClass *) klass)->finalize = notify_scan_failed_finalize;
 #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/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_scan_failed_real_run;
-#line 3619 "scanner.c"
+	((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/trunk/src/scanner.vala"
 	self->priv = NOTIFY_SCAN_FAILED_GET_PRIVATE (self);
-#line 3626 "scanner.c"
+#line 3642 "scanner.c"
 }
 
 
@@ -3634,7 +3650,7 @@ static void notify_scan_failed_finalize (Notify* obj) {
 	_g_free0 (self->priv->error_string);
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_scan_failed_parent_class)->finalize (obj);
-#line 3638 "scanner.c"
+#line 3654 "scanner.c"
 }
 
 
@@ -3661,7 +3677,7 @@ static void notify_document_done_real_run (Notify* base, Scanner* scanner) {
 	_tmp0_ = scanner;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "document-done");
-#line 3665 "scanner.c"
+#line 3681 "scanner.c"
 }
 
 
@@ -3671,14 +3687,14 @@ NotifyDocumentDone* notify_document_done_construct (GType object_type) {
 	self = (NotifyDocumentDone*) notify_construct (object_type);
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3675 "scanner.c"
+#line 3691 "scanner.c"
 }
 
 
 NotifyDocumentDone* notify_document_done_new (void) {
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_document_done_construct (TYPE_NOTIFY_DOCUMENT_DONE);
-#line 3682 "scanner.c"
+#line 3698 "scanner.c"
 }
 
 
@@ -3686,8 +3702,8 @@ static void notify_document_done_class_init (NotifyDocumentDoneClass * klass) {
 #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/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_document_done_real_run;
-#line 3691 "scanner.c"
+	((NotifyClass *) klass)->run = notify_document_done_real_run;
+#line 3707 "scanner.c"
 }
 
 
@@ -3718,7 +3734,7 @@ static void notify_expect_page_real_run (Notify* base, Scanner* scanner) {
 	_tmp0_ = scanner;
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "expect-page");
-#line 3722 "scanner.c"
+#line 3738 "scanner.c"
 }
 
 
@@ -3728,14 +3744,14 @@ NotifyExpectPage* notify_expect_page_construct (GType object_type) {
 	self = (NotifyExpectPage*) notify_construct (object_type);
 #line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3732 "scanner.c"
+#line 3748 "scanner.c"
 }
 
 
 NotifyExpectPage* notify_expect_page_new (void) {
 #line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_expect_page_construct (TYPE_NOTIFY_EXPECT_PAGE);
-#line 3739 "scanner.c"
+#line 3755 "scanner.c"
 }
 
 
@@ -3743,8 +3759,8 @@ static void notify_expect_page_class_init (NotifyExpectPageClass * klass) {
 #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/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_expect_page_real_run;
-#line 3748 "scanner.c"
+	((NotifyClass *) klass)->run = notify_expect_page_real_run;
+#line 3764 "scanner.c"
 }
 
 
@@ -3767,7 +3783,7 @@ GType notify_expect_page_get_type (void) {
 static gpointer _scan_page_info_ref0 (gpointer self) {
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_page_info_ref (self) : NULL;
-#line 3771 "scanner.c"
+#line 3787 "scanner.c"
 }
 
 
@@ -3794,14 +3810,14 @@ NotifyGotPageInfo* notify_got_page_info_construct (GType object_type, gint job_i
 	self->priv->info = _tmp2_;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3798 "scanner.c"
+#line 3814 "scanner.c"
 }
 
 
 NotifyGotPageInfo* notify_got_page_info_new (gint job_id, ScanPageInfo* info) {
 #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 3805 "scanner.c"
+#line 3821 "scanner.c"
 }
 
 
@@ -3823,7 +3839,7 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 	_tmp3_ = _tmp2_->first_job_id;
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
-#line 3827 "scanner.c"
+#line 3843 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -3835,15 +3851,15 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 		_tmp6_ = _tmp5_->job_id;
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
-#line 3839 "scanner.c"
+#line 3855 "scanner.c"
 	} else {
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 3843 "scanner.c"
+#line 3859 "scanner.c"
 	}
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 3847 "scanner.c"
+#line 3863 "scanner.c"
 		Scanner* _tmp7_ = NULL;
 		ScanPageInfo* _tmp8_ = NULL;
 #line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3852,7 +3868,7 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 		_tmp8_ = self->priv->info;
 #line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp7_, "got-page-info", _tmp8_);
-#line 3856 "scanner.c"
+#line 3872 "scanner.c"
 	}
 }
 
@@ -3861,19 +3877,19 @@ static void notify_got_page_info_class_init (NotifyGotPageInfoClass * klass) {
 #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/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->finalize = notify_got_page_info_finalize;
+	((NotifyClass *) klass)->finalize = notify_got_page_info_finalize;
 #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/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_got_page_info_real_run;
-#line 3870 "scanner.c"
+	((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/trunk/src/scanner.vala"
 	self->priv = NOTIFY_GOT_PAGE_INFO_GET_PRIVATE (self);
-#line 3877 "scanner.c"
+#line 3893 "scanner.c"
 }
 
 
@@ -3885,7 +3901,7 @@ static void notify_got_page_info_finalize (Notify* obj) {
 	_scan_page_info_unref0 (self->priv->info);
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_got_page_info_parent_class)->finalize (obj);
-#line 3889 "scanner.c"
+#line 3905 "scanner.c"
 }
 
 
@@ -3912,14 +3928,14 @@ NotifyPageDone* notify_page_done_construct (GType object_type, gint job_id) {
 	self->priv->job_id = _tmp0_;
 #line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3916 "scanner.c"
+#line 3932 "scanner.c"
 }
 
 
 NotifyPageDone* notify_page_done_new (gint job_id) {
 #line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_page_done_construct (TYPE_NOTIFY_PAGE_DONE, job_id);
-#line 3923 "scanner.c"
+#line 3939 "scanner.c"
 }
 
 
@@ -3941,7 +3957,7 @@ static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 	_tmp3_ = _tmp2_->first_job_id;
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
-#line 3945 "scanner.c"
+#line 3961 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -3953,21 +3969,21 @@ static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 		_tmp6_ = _tmp5_->job_id;
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
-#line 3957 "scanner.c"
+#line 3973 "scanner.c"
 	} else {
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 3961 "scanner.c"
+#line 3977 "scanner.c"
 	}
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 3965 "scanner.c"
+#line 3981 "scanner.c"
 		Scanner* _tmp7_ = NULL;
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = scanner;
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp7_, "page-done");
-#line 3971 "scanner.c"
+#line 3987 "scanner.c"
 	}
 }
 
@@ -3976,19 +3992,19 @@ static void notify_page_done_class_init (NotifyPageDoneClass * klass) {
 #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/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->finalize = notify_page_done_finalize;
+	((NotifyClass *) klass)->finalize = notify_page_done_finalize;
 #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/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_page_done_real_run;
-#line 3985 "scanner.c"
+	((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/trunk/src/scanner.vala"
 	self->priv = NOTIFY_PAGE_DONE_GET_PRIVATE (self);
-#line 3992 "scanner.c"
+#line 4008 "scanner.c"
 }
 
 
@@ -3998,7 +4014,7 @@ static void notify_page_done_finalize (Notify* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_PAGE_DONE, NotifyPageDone);
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_page_done_parent_class)->finalize (obj);
-#line 4002 "scanner.c"
+#line 4018 "scanner.c"
 }
 
 
@@ -4017,7 +4033,7 @@ GType notify_page_done_get_type (void) {
 static gpointer _scan_line_ref0 (gpointer self) {
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_line_ref (self) : NULL;
-#line 4021 "scanner.c"
+#line 4037 "scanner.c"
 }
 
 
@@ -4044,14 +4060,14 @@ NotifyGotLine* notify_got_line_construct (GType object_type, gint job_id, ScanLi
 	self->priv->line = _tmp2_;
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 4048 "scanner.c"
+#line 4064 "scanner.c"
 }
 
 
 NotifyGotLine* notify_got_line_new (gint job_id, ScanLine* line) {
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_got_line_construct (TYPE_NOTIFY_GOT_LINE, job_id, line);
-#line 4055 "scanner.c"
+#line 4071 "scanner.c"
 }
 
 
@@ -4073,7 +4089,7 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 	_tmp3_ = _tmp2_->first_job_id;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
-#line 4077 "scanner.c"
+#line 4093 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -4085,15 +4101,15 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 		_tmp6_ = _tmp5_->job_id;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
-#line 4089 "scanner.c"
+#line 4105 "scanner.c"
 	} else {
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 4093 "scanner.c"
+#line 4109 "scanner.c"
 	}
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 4097 "scanner.c"
+#line 4113 "scanner.c"
 		Scanner* _tmp7_ = NULL;
 		ScanLine* _tmp8_ = NULL;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4102,7 +4118,7 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 		_tmp8_ = self->priv->line;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp7_, "got-line", _tmp8_);
-#line 4106 "scanner.c"
+#line 4122 "scanner.c"
 	}
 }
 
@@ -4111,19 +4127,19 @@ static void notify_got_line_class_init (NotifyGotLineClass * klass) {
 #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/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->finalize = notify_got_line_finalize;
+	((NotifyClass *) klass)->finalize = notify_got_line_finalize;
 #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/trunk/src/scanner.vala"
-	NOTIFY_CLASS (klass)->run = notify_got_line_real_run;
-#line 4120 "scanner.c"
+	((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/trunk/src/scanner.vala"
 	self->priv = NOTIFY_GOT_LINE_GET_PRIVATE (self);
-#line 4127 "scanner.c"
+#line 4143 "scanner.c"
 }
 
 
@@ -4135,7 +4151,7 @@ static void notify_got_line_finalize (Notify* obj) {
 	_scan_line_unref0 (self->priv->line);
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_got_line_parent_class)->finalize (obj);
-#line 4139 "scanner.c"
+#line 4155 "scanner.c"
 }
 
 
@@ -4154,7 +4170,7 @@ GType notify_got_line_get_type (void) {
 static void _scan_job_unref0_ (gpointer var) {
 #line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (scan_job_unref (var), NULL));
-#line 4158 "scanner.c"
+#line 4174 "scanner.c"
 }
 
 
@@ -4163,28 +4179,28 @@ static void _g_list_free__scan_job_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _scan_job_unref0_, NULL);
 #line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_free (self);
-#line 4167 "scanner.c"
+#line 4183 "scanner.c"
 }
 
 
 static void _request_unref0_ (gpointer var) {
 #line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (request_unref (var), NULL));
-#line 4174 "scanner.c"
+#line 4190 "scanner.c"
 }
 
 
 static void _notify_unref0_ (gpointer var) {
 #line 274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (notify_unref (var), NULL));
-#line 4181 "scanner.c"
+#line 4197 "scanner.c"
 }
 
 
 static void _credentials_unref0_ (gpointer var) {
 #line 275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (credentials_unref (var), NULL));
-#line 4188 "scanner.c"
+#line 4204 "scanner.c"
 }
 
 
@@ -4215,21 +4231,21 @@ static Scanner* scanner_construct (GType object_type) {
 	self->priv->authorize_queue = _tmp2_;
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 4219 "scanner.c"
+#line 4235 "scanner.c"
 }
 
 
 static Scanner* scanner_new (void) {
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scanner_construct (TYPE_SCANNER);
-#line 4226 "scanner.c"
+#line 4242 "scanner.c"
 }
 
 
 static gpointer _scanner_ref0 (gpointer self) {
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scanner_ref (self) : NULL;
-#line 4233 "scanner.c"
+#line 4249 "scanner.c"
 }
 
 
@@ -4242,7 +4258,7 @@ Scanner* scanner_get_instance (void) {
 	_tmp0_ = scanner_scanner_object;
 #line 280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_ == NULL) {
-#line 4246 "scanner.c"
+#line 4262 "scanner.c"
 		Scanner* _tmp1_ = NULL;
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = scanner_new ();
@@ -4250,7 +4266,7 @@ Scanner* scanner_get_instance (void) {
 		_scanner_unref0 (scanner_scanner_object);
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_scanner_object = _tmp1_;
-#line 4254 "scanner.c"
+#line 4270 "scanner.c"
 	}
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner_scanner_object;
@@ -4260,7 +4276,7 @@ Scanner* scanner_get_instance (void) {
 	result = _tmp3_;
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4264 "scanner.c"
+#line 4280 "scanner.c"
 }
 
 
@@ -4285,14 +4301,14 @@ static gboolean scanner_notify_idle_cb (Scanner* self) {
 	_notify_unref0 (notification);
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4289 "scanner.c"
+#line 4305 "scanner.c"
 }
 
 
 static gpointer _notify_ref0 (gpointer self) {
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? notify_ref (self) : NULL;
-#line 4296 "scanner.c"
+#line 4312 "scanner.c"
 }
 
 
@@ -4301,7 +4317,7 @@ static gboolean _scanner_notify_idle_cb_gsource_func (gpointer self) {
 	result = scanner_notify_idle_cb ((Scanner*) self);
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4305 "scanner.c"
+#line 4321 "scanner.c"
 }
 
 
@@ -4323,7 +4339,7 @@ static void scanner_notify (Scanner* self, Notify* notification) {
 	g_async_queue_push (_tmp0_, _tmp2_);
 #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 4327 "scanner.c"
+#line 4343 "scanner.c"
 }
 
 
@@ -4337,23 +4353,23 @@ static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 	_tmp2_ = self->priv->scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_) {
-#line 4341 "scanner.c"
+#line 4357 "scanner.c"
 		gboolean _tmp3_ = FALSE;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = is_scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = !_tmp3_;
-#line 4347 "scanner.c"
+#line 4363 "scanner.c"
 	} else {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = FALSE;
-#line 4351 "scanner.c"
+#line 4367 "scanner.c"
 	}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_) {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = TRUE;
-#line 4357 "scanner.c"
+#line 4373 "scanner.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
@@ -4361,25 +4377,25 @@ static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 		_tmp5_ = self->priv->scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (!_tmp5_) {
-#line 4365 "scanner.c"
+#line 4381 "scanner.c"
 			gboolean _tmp6_ = FALSE;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = is_scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = _tmp6_;
-#line 4371 "scanner.c"
+#line 4387 "scanner.c"
 		} else {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = FALSE;
-#line 4375 "scanner.c"
+#line 4391 "scanner.c"
 		}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_;
-#line 4379 "scanner.c"
+#line 4395 "scanner.c"
 	}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 4383 "scanner.c"
+#line 4399 "scanner.c"
 		gboolean _tmp7_ = FALSE;
 		NotifyScanningChanged* _tmp8_ = NULL;
 		NotifyScanningChanged* _tmp9_ = NULL;
@@ -4395,7 +4411,7 @@ static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 		scanner_notify (self, (Notify*) _tmp9_);
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp9_);
-#line 4399 "scanner.c"
+#line 4415 "scanner.c"
 	}
 }
 
@@ -4404,19 +4420,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1274 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1278 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1274 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1278 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1275 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1275 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1275 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1275 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	return result;
-#line 4420 "scanner.c"
+#line 4436 "scanner.c"
 }
 
 
@@ -4438,7 +4454,7 @@ static gint scanner_get_device_weight (const gchar* device) {
 		result = 2;
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 4442 "scanner.c"
+#line 4458 "scanner.c"
 	}
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = device;
@@ -4450,13 +4466,13 @@ static gint scanner_get_device_weight (const gchar* device) {
 		result = 0;
 #line 317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 4454 "scanner.c"
+#line 4470 "scanner.c"
 	}
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = 1;
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4460 "scanner.c"
+#line 4476 "scanner.c"
 }
 
 
@@ -4504,7 +4520,7 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 	_tmp7_ = weight2;
 #line 328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != _tmp7_) {
-#line 4508 "scanner.c"
+#line 4524 "scanner.c"
 		gint _tmp8_ = 0;
 		gint _tmp9_ = 0;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4515,7 +4531,7 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 		result = _tmp8_ - _tmp9_;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 4519 "scanner.c"
+#line 4535 "scanner.c"
 	}
 #line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = g_strcmp0;
@@ -4533,7 +4549,7 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 	result = _tmp15_;
 #line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4537 "scanner.c"
+#line 4553 "scanner.c"
 }
 
 
@@ -4546,7 +4562,7 @@ static gchar* sane_status_to_string (SANE_Status status) {
 	switch (_tmp0_) {
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_GOOD:
-#line 4550 "scanner.c"
+#line 4566 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4555,11 +4571,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp1_;
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4559 "scanner.c"
+#line 4575 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_UNSUPPORTED:
-#line 4563 "scanner.c"
+#line 4579 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4568,11 +4584,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp2_;
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4572 "scanner.c"
+#line 4588 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_CANCELLED:
-#line 4576 "scanner.c"
+#line 4592 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4581,11 +4597,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp3_;
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4585 "scanner.c"
+#line 4601 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_DEVICE_BUSY:
-#line 4589 "scanner.c"
+#line 4605 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4594,11 +4610,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp4_;
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4598 "scanner.c"
+#line 4614 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_INVAL:
-#line 4602 "scanner.c"
+#line 4618 "scanner.c"
 		{
 			gchar* _tmp5_ = NULL;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4607,11 +4623,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp5_;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4611 "scanner.c"
+#line 4627 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_EOF:
-#line 4615 "scanner.c"
+#line 4631 "scanner.c"
 		{
 			gchar* _tmp6_ = NULL;
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4620,11 +4636,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp6_;
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4624 "scanner.c"
+#line 4640 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_JAMMED:
-#line 4628 "scanner.c"
+#line 4644 "scanner.c"
 		{
 			gchar* _tmp7_ = NULL;
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4633,11 +4649,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp7_;
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4637 "scanner.c"
+#line 4653 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_DOCS:
-#line 4641 "scanner.c"
+#line 4657 "scanner.c"
 		{
 			gchar* _tmp8_ = NULL;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4646,11 +4662,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp8_;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4650 "scanner.c"
+#line 4666 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_COVER_OPEN:
-#line 4654 "scanner.c"
+#line 4670 "scanner.c"
 		{
 			gchar* _tmp9_ = NULL;
 #line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4659,11 +4675,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp9_;
 #line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4663 "scanner.c"
+#line 4679 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_IO_ERROR:
-#line 4667 "scanner.c"
+#line 4683 "scanner.c"
 		{
 			gchar* _tmp10_ = NULL;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4672,11 +4688,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp10_;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4676 "scanner.c"
+#line 4692 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_MEM:
-#line 4680 "scanner.c"
+#line 4696 "scanner.c"
 		{
 			gchar* _tmp11_ = NULL;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4685,11 +4701,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp11_;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4689 "scanner.c"
+#line 4705 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_ACCESS_DENIED:
-#line 4693 "scanner.c"
+#line 4709 "scanner.c"
 		{
 			gchar* _tmp12_ = NULL;
 #line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4698,7 +4714,7 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp12_;
 #line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4702 "scanner.c"
+#line 4718 "scanner.c"
 		}
 		default:
 		{
@@ -4712,7 +4728,7 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp14_;
 #line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4716 "scanner.c"
+#line 4732 "scanner.c"
 		}
 	}
 }
@@ -4721,13 +4737,13 @@ static gchar* sane_status_to_string (SANE_Status status) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1278 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1282 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1278 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1282 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1278 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1282 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 4731 "scanner.c"
+#line 4747 "scanner.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -4740,100 +4756,100 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
-		if (_inner_error_ != NULL) {
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4762 "scanner.c"
+#line 4778 "scanner.c"
 				goto __catch14_g_regex_error;
 			}
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4771 "scanner.c"
+#line 4787 "scanner.c"
 		}
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) (-1), 0, _tmp7_, 0, &_inner_error_);
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
-		if (_inner_error_ != NULL) {
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4787 "scanner.c"
+#line 4803 "scanner.c"
 				goto __catch14_g_regex_error;
 			}
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4798 "scanner.c"
+#line 4814 "scanner.c"
 		}
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		return result;
-#line 4812 "scanner.c"
+#line 4828 "scanner.c"
 	}
 	goto __finally14;
 	__catch14_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1283 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1287 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 4826 "scanner.c"
+#line 4842 "scanner.c"
 	}
 	__finally14:
-#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
-	if (_inner_error_ != NULL) {
-#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		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 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 		return NULL;
-#line 4837 "scanner.c"
+#line 4853 "scanner.c"
 	}
 }
 
@@ -4841,7 +4857,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/trunk/src/scanner.vala"
 	return self ? scan_device_ref (self) : NULL;
-#line 4845 "scanner.c"
+#line 4861 "scanner.c"
 }
 
 
@@ -4850,7 +4866,7 @@ static gint _scanner_compare_devices_gcompare_func (gconstpointer a, gconstpoint
 	result = scanner_compare_devices ((ScanDevice*) a, (ScanDevice*) b);
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4854 "scanner.c"
+#line 4870 "scanner.c"
 }
 
 
@@ -4902,7 +4918,7 @@ static void scanner_do_redetect (Scanner* self) {
 	_tmp5_ = status;
 #line 339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
-#line 4906 "scanner.c"
+#line 4922 "scanner.c"
 		SANE_Status _tmp6_ = 0;
 		const gchar* _tmp7_ = NULL;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4917,23 +4933,23 @@ static void scanner_do_redetect (Scanner* self) {
 		self->priv->state = SCAN_STATE_IDLE;
 #line 344 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 4921 "scanner.c"
+#line 4937 "scanner.c"
 	}
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = NULL;
-#line 4925 "scanner.c"
+#line 4941 "scanner.c"
 	{
 		gint i = 0;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 4930 "scanner.c"
+#line 4946 "scanner.c"
 		{
 			gboolean _tmp8_ = FALSE;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp8_ = TRUE;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 4937 "scanner.c"
+#line 4953 "scanner.c"
 				SANE_Device** _tmp10_ = NULL;
 				gint _tmp10__length1 = 0;
 				gint _tmp11_ = 0;
@@ -4991,13 +5007,13 @@ static void scanner_do_redetect (Scanner* self) {
 				ScanDevice* _tmp55_ = NULL;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp8_) {
-#line 4995 "scanner.c"
+#line 5011 "scanner.c"
 					gint _tmp9_ = 0;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = i;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp9_ + 1;
-#line 5001 "scanner.c"
+#line 5017 "scanner.c"
 				}
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = FALSE;
@@ -5013,7 +5029,7 @@ static void scanner_do_redetect (Scanner* self) {
 				if (!(_tmp12_ != NULL)) {
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 5017 "scanner.c"
+#line 5033 "scanner.c"
 				}
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13_ = device_list;
@@ -5098,7 +5114,7 @@ static void scanner_do_redetect (Scanner* self) {
 				_tmp41_ = vendor;
 #line 358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (g_strcmp0 (_tmp41_, "Hewlett-Packard") == 0) {
-#line 5101 "scanner.c"
+#line 5117 "scanner.c"
 					gchar* _tmp42_ = NULL;
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp42_ = g_strdup ("HP");
@@ -5106,7 +5122,7 @@ static void scanner_do_redetect (Scanner* self) {
 					_g_free0 (vendor);
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					vendor = _tmp42_;
-#line 5109 "scanner.c"
+#line 5125 "scanner.c"
 				}
 #line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp43_ = scan_device;
@@ -5148,7 +5164,7 @@ static void scanner_do_redetect (Scanner* self) {
 				_g_free0 (vendor);
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_scan_device_unref0 (scan_device);
-#line 5151 "scanner.c"
+#line 5167 "scanner.c"
 			}
 		}
 	}
@@ -5162,7 +5178,7 @@ static void scanner_do_redetect (Scanner* self) {
 	_tmp56_ = devices;
 #line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp56_ != NULL) {
-#line 5165 "scanner.c"
+#line 5181 "scanner.c"
 		ScanDevice* device = NULL;
 		GList* _tmp57_ = NULL;
 		gconstpointer _tmp58_ = NULL;
@@ -5190,13 +5206,13 @@ static void scanner_do_redetect (Scanner* self) {
 		self->priv->default_device = _tmp62_;
 #line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_device_unref0 (device);
-#line 5193 "scanner.c"
+#line 5209 "scanner.c"
 	} else {
 #line 380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (self->priv->default_device);
 #line 380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->default_device = NULL;
-#line 5199 "scanner.c"
+#line 5215 "scanner.c"
 	}
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp63_ = devices;
@@ -5212,7 +5228,7 @@ static void scanner_do_redetect (Scanner* self) {
 	_notify_unref0 (_tmp65_);
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (devices);
-#line 5215 "scanner.c"
+#line 5231 "scanner.c"
 }
 
 
@@ -5248,7 +5264,7 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 	_tmp6_ = _tmp5_->constraint_type;
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ == SANE_CONSTRAINT_RANGE) {
-#line 5251 "scanner.c"
+#line 5267 "scanner.c"
 		SANE_Option_Descriptor* _tmp7_ = NULL;
 		SANE_Range* _tmp8_ = NULL;
 		SANE_Word _tmp9_ = {0};
@@ -5269,15 +5285,15 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 		_tmp12_ = _tmp11_->min;
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = _tmp9_ != _tmp12_;
-#line 5272 "scanner.c"
+#line 5288 "scanner.c"
 	} else {
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = FALSE;
-#line 5276 "scanner.c"
+#line 5292 "scanner.c"
 	}
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_) {
-#line 5280 "scanner.c"
+#line 5296 "scanner.c"
 		gint _tmp13_ = 0;
 		gint _tmp14_ = 0;
 		gint _tmp15_ = 0;
@@ -5367,13 +5383,13 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 #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 5369 "scanner.c"
+#line 5385 "scanner.c"
 	}
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = v;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 5375 "scanner.c"
+#line 5391 "scanner.c"
 }
 
 
@@ -5405,7 +5421,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 		result = FALSE;
 #line 408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 5407 "scanner.c"
+#line 5423 "scanner.c"
 	}
 #line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = handle;
@@ -5431,7 +5447,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 	_tmp9_ = status;
 #line 412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ != SANE_STATUS_GOOD) {
-#line 5433 "scanner.c"
+#line 5449 "scanner.c"
 		SANE_Option_Descriptor* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		SANE_Status _tmp12_ = 0;
@@ -5446,7 +5462,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 		_tmp13_ = sane_strstatus (_tmp12_);
 #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 5448 "scanner.c"
+#line 5464 "scanner.c"
 	}
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = status;
@@ -5454,7 +5470,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 	result = _tmp14_ == SANE_STATUS_GOOD;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 5456 "scanner.c"
+#line 5472 "scanner.c"
 }
 
 
@@ -5509,11 +5525,11 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	if (_tmp8_) {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = "SANE_TRUE";
-#line 5511 "scanner.c"
+#line 5527 "scanner.c"
 	} else {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = "SANE_FALSE";
-#line 5515 "scanner.c"
+#line 5531 "scanner.c"
 	}
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = _vala_result;
@@ -5521,11 +5537,11 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	if (_tmp10_) {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = "SANE_TRUE";
-#line 5523 "scanner.c"
+#line 5539 "scanner.c"
 	} else {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = "SANE_FALSE";
-#line 5527 "scanner.c"
+#line 5543 "scanner.c"
 	}
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = option_index;
@@ -5544,7 +5560,7 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	if (_result_) {
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 5545 "scanner.c"
+#line 5561 "scanner.c"
 	}
 }
 
@@ -5558,15 +5574,15 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 	SANE_Option_Descriptor* _tmp3_ = NULL;
 	SANE_Constraint_Type _tmp4_ = 0;
 	SANE_Status status = 0;
-	SANE_Handle _tmp48_ = {0};
-	SANE_Int _tmp49_ = {0};
-	SANE_Status _tmp50_ = 0;
-	SANE_Int _tmp51_ = {0};
-	gint _tmp52_ = 0;
+	SANE_Handle _tmp47_ = {0};
+	SANE_Int _tmp48_ = {0};
+	SANE_Status _tmp49_ = 0;
+	SANE_Int _tmp50_ = {0};
+	gint _tmp51_ = 0;
+	gchar* _tmp52_ = NULL;
 	gchar* _tmp53_ = NULL;
-	gchar* _tmp54_ = NULL;
+	SANE_Int _tmp54_ = {0};
 	SANE_Int _tmp55_ = {0};
-	SANE_Int _tmp56_ = {0};
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5587,7 +5603,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 	_tmp4_ = _tmp3_->constraint_type;
 #line 433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_ == SANE_CONSTRAINT_RANGE) {
-#line 5588 "scanner.c"
+#line 5604 "scanner.c"
 		SANE_Option_Descriptor* _tmp5_ = NULL;
 		SANE_Range* _tmp6_ = NULL;
 		SANE_Word _tmp7_ = {0};
@@ -5607,7 +5623,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp7_ = _tmp6_->quant;
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp7_ != ((SANE_Word) 0)) {
-#line 5608 "scanner.c"
+#line 5624 "scanner.c"
 			SANE_Int _tmp8_ = {0};
 			SANE_Option_Descriptor* _tmp9_ = NULL;
 			SANE_Range* _tmp10_ = NULL;
@@ -5622,7 +5638,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp11_ = _tmp10_->quant;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp8_ * _tmp11_;
-#line 5623 "scanner.c"
+#line 5639 "scanner.c"
 		}
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = v;
@@ -5634,7 +5650,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp15_ = _tmp14_->min;
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp12_ < ((SANE_Int) _tmp15_)) {
-#line 5635 "scanner.c"
+#line 5651 "scanner.c"
 			SANE_Option_Descriptor* _tmp16_ = NULL;
 			SANE_Range* _tmp17_ = NULL;
 			SANE_Word _tmp18_ = {0};
@@ -5646,7 +5662,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp18_ = _tmp17_->min;
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp18_;
-#line 5647 "scanner.c"
+#line 5663 "scanner.c"
 		}
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = v;
@@ -5658,7 +5674,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp22_ = _tmp21_->max;
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp19_ > ((SANE_Int) _tmp22_)) {
-#line 5659 "scanner.c"
+#line 5675 "scanner.c"
 			SANE_Option_Descriptor* _tmp23_ = NULL;
 			SANE_Range* _tmp24_ = NULL;
 			SANE_Word _tmp25_ = {0};
@@ -5670,7 +5686,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp25_ = _tmp24_->max;
 #line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp25_;
-#line 5671 "scanner.c"
+#line 5687 "scanner.c"
 		}
 	} else {
 		SANE_Option_Descriptor* _tmp26_ = NULL;
@@ -5681,161 +5697,158 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp27_ = _tmp26_->constraint_type;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp27_ == SANE_CONSTRAINT_WORD_LIST) {
-#line 5682 "scanner.c"
+#line 5698 "scanner.c"
 			gint distance = 0;
-			gint _tmp28_ = 0;
 			gint nearest = 0;
-			gint _tmp47_ = 0;
+			gint _tmp46_ = 0;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp28_ = G_MAXINT;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			distance = _tmp28_;
+			distance = G_MAXINT;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0;
-#line 5693 "scanner.c"
+#line 5706 "scanner.c"
 			{
 				gint i = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 5698 "scanner.c"
+#line 5711 "scanner.c"
 				{
-					gboolean _tmp29_ = FALSE;
+					gboolean _tmp28_ = FALSE;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp29_ = TRUE;
+					_tmp28_ = TRUE;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 5705 "scanner.c"
-						gint _tmp31_ = 0;
-						SANE_Option_Descriptor* _tmp32_ = NULL;
-						SANE_Word* _tmp33_ = NULL;
-						gint _tmp33__length1 = 0;
-						SANE_Word _tmp34_ = {0};
+#line 5718 "scanner.c"
+						gint _tmp30_ = 0;
+						SANE_Option_Descriptor* _tmp31_ = NULL;
+						SANE_Word* _tmp32_ = NULL;
+						gint _tmp32__length1 = 0;
+						SANE_Word _tmp33_ = {0};
 						gint x = 0;
-						SANE_Option_Descriptor* _tmp35_ = NULL;
-						SANE_Word* _tmp36_ = NULL;
-						gint _tmp36__length1 = 0;
-						gint _tmp37_ = 0;
-						SANE_Word _tmp38_ = {0};
+						SANE_Option_Descriptor* _tmp34_ = NULL;
+						SANE_Word* _tmp35_ = NULL;
+						gint _tmp35__length1 = 0;
+						gint _tmp36_ = 0;
+						SANE_Word _tmp37_ = {0};
 						gint d = 0;
-						gint _tmp39_ = 0;
-						SANE_Int _tmp40_ = {0};
+						gint _tmp38_ = 0;
+						SANE_Int _tmp39_ = {0};
+						gint _tmp40_ = 0;
 						gint _tmp41_ = 0;
 						gint _tmp42_ = 0;
 						gint _tmp43_ = 0;
-						gint _tmp44_ = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp29_) {
-#line 5726 "scanner.c"
-							gint _tmp30_ = 0;
+						if (!_tmp28_) {
+#line 5739 "scanner.c"
+							gint _tmp29_ = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp30_ = i;
+							_tmp29_ = i;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							i = _tmp30_ + 1;
-#line 5732 "scanner.c"
+							i = _tmp29_ + 1;
+#line 5745 "scanner.c"
 						}
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp29_ = FALSE;
+						_tmp28_ = FALSE;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp31_ = i;
+						_tmp30_ = i;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp32_ = option;
+						_tmp31_ = option;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp33_ = _tmp32_->constraint.word_list;
+						_tmp32_ = _tmp31_->constraint.word_list;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp33__length1 = -1;
+						_tmp32__length1 = -1;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp34_ = _tmp33_[0];
+						_tmp33_ = _tmp32_[0];
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!(((SANE_Word) _tmp31_) < _tmp34_)) {
+						if (!(((SANE_Word) _tmp30_) < _tmp33_)) {
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 5750 "scanner.c"
+#line 5763 "scanner.c"
 						}
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp35_ = option;
+						_tmp34_ = option;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp36_ = _tmp35_->constraint.word_list;
+						_tmp35_ = _tmp34_->constraint.word_list;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp36__length1 = -1;
+						_tmp35__length1 = -1;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp37_ = i;
+						_tmp36_ = i;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp38_ = _tmp36_[_tmp37_ + 1];
+						_tmp37_ = _tmp35_[_tmp36_ + 1];
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						x = (gint) _tmp38_;
+						x = (gint) _tmp37_;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp39_ = x;
+						_tmp38_ = x;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp40_ = v;
+						_tmp39_ = v;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						d = (gint) (_tmp39_ - _tmp40_);
+						d = (gint) (_tmp38_ - _tmp39_);
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp41_ = d;
+						_tmp40_ = d;
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp42_ = abs (_tmp41_);
+						_tmp41_ = abs (_tmp40_);
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						d = _tmp42_;
+						d = _tmp41_;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp43_ = d;
+						_tmp42_ = d;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp44_ = distance;
+						_tmp43_ = distance;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (_tmp43_ < _tmp44_) {
-#line 5782 "scanner.c"
+						if (_tmp42_ < _tmp43_) {
+#line 5795 "scanner.c"
+							gint _tmp44_ = 0;
 							gint _tmp45_ = 0;
-							gint _tmp46_ = 0;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp45_ = d;
+							_tmp44_ = d;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							distance = _tmp45_;
+							distance = _tmp44_;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp46_ = x;
+							_tmp45_ = x;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							nearest = _tmp46_;
-#line 5793 "scanner.c"
+							nearest = _tmp45_;
+#line 5806 "scanner.c"
 						}
 					}
 				}
 			}
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp47_ = nearest;
+			_tmp46_ = nearest;
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			v = (SANE_Int) _tmp47_;
-#line 5802 "scanner.c"
+			v = (SANE_Int) _tmp46_;
+#line 5815 "scanner.c"
 		}
 	}
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp48_ = handle;
+	_tmp47_ = handle;
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp49_ = option_index;
+	_tmp48_ = option_index;
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp50_ = sane_control_option (_tmp48_, _tmp49_, SANE_ACTION_SET_VALUE, &v, NULL);
+	_tmp49_ = sane_control_option (_tmp47_, _tmp48_, SANE_ACTION_SET_VALUE, &v, NULL);
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp50_;
+	status = _tmp49_;
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp51_ = option_index;
+	_tmp50_ = option_index;
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp52_ = value;
+	_tmp51_ = value;
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp53_ = sane_status_to_string (status);
+	_tmp52_ = sane_status_to_string (status);
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp54_ = _tmp53_;
+	_tmp53_ = _tmp52_;
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp55_ = v;
+	_tmp54_ = v;
 #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) _tmp51_, _tmp52_, _tmp54_, (gint) _tmp55_);
+"-> (%s, %d)", (gint) _tmp50_, _tmp51_, _tmp53_, (gint) _tmp54_);
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp54_);
+	_g_free0 (_tmp53_);
 #line 463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp56_ = v;
+	_tmp55_ = v;
 #line 463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_vala_result = (gint) _tmp56_;
+	_vala_result = (gint) _tmp55_;
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 5835 "scanner.c"
+#line 5848 "scanner.c"
 	}
 }
 
@@ -5849,18 +5862,18 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 	SANE_Value_Type _tmp2_ = 0;
 	SANE_Option_Descriptor* _tmp3_ = NULL;
 	SANE_Constraint_Type _tmp4_ = 0;
-	gdouble _tmp42_ = 0.0;
-	SANE_Fixed _tmp43_ = {0};
+	gdouble _tmp41_ = 0.0;
+	SANE_Fixed _tmp42_ = {0};
 	SANE_Status status = 0;
-	SANE_Handle _tmp44_ = {0};
-	SANE_Int _tmp45_ = {0};
-	SANE_Status _tmp46_ = 0;
-	SANE_Int _tmp47_ = {0};
-	gdouble _tmp48_ = 0.0;
+	SANE_Handle _tmp43_ = {0};
+	SANE_Int _tmp44_ = {0};
+	SANE_Status _tmp45_ = 0;
+	SANE_Int _tmp46_ = {0};
+	gdouble _tmp47_ = 0.0;
+	gchar* _tmp48_ = NULL;
 	gchar* _tmp49_ = NULL;
-	gchar* _tmp50_ = NULL;
+	gdouble _tmp50_ = 0.0;
 	gdouble _tmp51_ = 0.0;
-	gdouble _tmp52_ = 0.0;
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5881,7 +5894,7 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 	_tmp4_ = _tmp3_->constraint_type;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_ == SANE_CONSTRAINT_RANGE) {
-#line 5881 "scanner.c"
+#line 5894 "scanner.c"
 		gdouble min = 0.0;
 		SANE_Option_Descriptor* _tmp5_ = NULL;
 		SANE_Range* _tmp6_ = NULL;
@@ -5922,13 +5935,13 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 		_tmp14_ = min;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp13_ < _tmp14_) {
-#line 5922 "scanner.c"
+#line 5935 "scanner.c"
 			gdouble _tmp15_ = 0.0;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = min;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp15_;
-#line 5928 "scanner.c"
+#line 5941 "scanner.c"
 		}
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = v;
@@ -5936,13 +5949,13 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 		_tmp17_ = max;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp16_ > _tmp17_) {
-#line 5936 "scanner.c"
+#line 5949 "scanner.c"
 			gdouble _tmp18_ = 0.0;
 #line 481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = max;
 #line 481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp18_;
-#line 5942 "scanner.c"
+#line 5955 "scanner.c"
 		}
 	} else {
 		SANE_Option_Descriptor* _tmp19_ = NULL;
@@ -5953,165 +5966,162 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 		_tmp20_ = _tmp19_->constraint_type;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ == SANE_CONSTRAINT_WORD_LIST) {
-#line 5953 "scanner.c"
+#line 5966 "scanner.c"
 			gdouble distance = 0.0;
-			gdouble _tmp21_ = 0.0;
 			gdouble nearest = 0.0;
-			gdouble _tmp41_ = 0.0;
+			gdouble _tmp40_ = 0.0;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp21_ = DBL_MAX;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			distance = _tmp21_;
+			distance = DBL_MAX;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0.0;
-#line 5964 "scanner.c"
+#line 5974 "scanner.c"
 			{
 				gint i = 0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 5969 "scanner.c"
+#line 5979 "scanner.c"
 				{
-					gboolean _tmp22_ = FALSE;
+					gboolean _tmp21_ = FALSE;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp22_ = TRUE;
+					_tmp21_ = TRUE;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 5976 "scanner.c"
-						gint _tmp24_ = 0;
-						SANE_Option_Descriptor* _tmp25_ = NULL;
-						SANE_Word* _tmp26_ = NULL;
-						gint _tmp26__length1 = 0;
-						SANE_Word _tmp27_ = {0};
+#line 5986 "scanner.c"
+						gint _tmp23_ = 0;
+						SANE_Option_Descriptor* _tmp24_ = NULL;
+						SANE_Word* _tmp25_ = NULL;
+						gint _tmp25__length1 = 0;
+						SANE_Word _tmp26_ = {0};
 						gdouble x = 0.0;
-						SANE_Option_Descriptor* _tmp28_ = NULL;
-						SANE_Word* _tmp29_ = NULL;
-						gint _tmp29__length1 = 0;
-						gint _tmp30_ = 0;
-						SANE_Word _tmp31_ = {0};
+						SANE_Option_Descriptor* _tmp27_ = NULL;
+						SANE_Word* _tmp28_ = NULL;
+						gint _tmp28__length1 = 0;
+						gint _tmp29_ = 0;
+						SANE_Word _tmp30_ = {0};
+						gdouble _tmp31_ = 0.0;
 						gdouble _tmp32_ = 0.0;
 						gdouble _tmp33_ = 0.0;
 						gdouble _tmp34_ = 0.0;
 						gdouble _tmp35_ = 0.0;
-						gdouble _tmp36_ = 0.0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp22_) {
-#line 5995 "scanner.c"
-							gint _tmp23_ = 0;
+						if (!_tmp21_) {
+#line 6005 "scanner.c"
+							gint _tmp22_ = 0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp23_ = i;
+							_tmp22_ = i;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							i = _tmp23_ + 1;
-#line 6001 "scanner.c"
+							i = _tmp22_ + 1;
+#line 6011 "scanner.c"
 						}
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp22_ = FALSE;
+						_tmp21_ = FALSE;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp24_ = i;
+						_tmp23_ = i;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp25_ = option;
+						_tmp24_ = option;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp26_ = _tmp25_->constraint.word_list;
+						_tmp25_ = _tmp24_->constraint.word_list;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp26__length1 = -1;
+						_tmp25__length1 = -1;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp27_ = _tmp26_[0];
+						_tmp26_ = _tmp25_[0];
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!(((SANE_Word) _tmp24_) < _tmp27_)) {
+						if (!(((SANE_Word) _tmp23_) < _tmp26_)) {
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6019 "scanner.c"
+#line 6029 "scanner.c"
 						}
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp28_ = option;
+						_tmp27_ = option;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp29_ = _tmp28_->constraint.word_list;
+						_tmp28_ = _tmp27_->constraint.word_list;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp29__length1 = -1;
+						_tmp28__length1 = -1;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp30_ = i;
+						_tmp29_ = i;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp31_ = _tmp29_[_tmp30_ + 1];
+						_tmp30_ = _tmp28_[_tmp29_ + 1];
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp32_ = SANE_UNFIX ((SANE_Fixed) _tmp31_);
+						_tmp31_ = SANE_UNFIX ((SANE_Fixed) _tmp30_);
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						x = _tmp32_;
+						x = _tmp31_;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp33_ = x;
+						_tmp32_ = x;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp34_ = v;
+						_tmp33_ = v;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp35_ = fabs (_tmp33_ - _tmp34_);
+						_tmp34_ = fabs (_tmp32_ - _tmp33_);
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp36_ = distance;
+						_tmp35_ = distance;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (_tmp35_ < _tmp36_) {
-#line 6045 "scanner.c"
+						if (_tmp34_ < _tmp35_) {
+#line 6055 "scanner.c"
+							gdouble _tmp36_ = 0.0;
 							gdouble _tmp37_ = 0.0;
 							gdouble _tmp38_ = 0.0;
 							gdouble _tmp39_ = 0.0;
-							gdouble _tmp40_ = 0.0;
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp37_ = x;
+							_tmp36_ = x;
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp38_ = v;
+							_tmp37_ = v;
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp39_ = fabs (_tmp37_ - _tmp38_);
+							_tmp38_ = fabs (_tmp36_ - _tmp37_);
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							distance = _tmp39_;
+							distance = _tmp38_;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp40_ = x;
+							_tmp39_ = x;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							nearest = _tmp40_;
-#line 6062 "scanner.c"
+							nearest = _tmp39_;
+#line 6072 "scanner.c"
 						}
 					}
 				}
 			}
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp41_ = nearest;
+			_tmp40_ = nearest;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			v = _tmp41_;
-#line 6071 "scanner.c"
+			v = _tmp40_;
+#line 6081 "scanner.c"
 		}
 	}
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp42_ = v;
+	_tmp41_ = v;
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp43_ = SANE_FIX (_tmp42_);
+	_tmp42_ = SANE_FIX (_tmp41_);
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	v_fixed = _tmp43_;
+	v_fixed = _tmp42_;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp44_ = handle;
+	_tmp43_ = handle;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp45_ = option_index;
+	_tmp44_ = option_index;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp46_ = sane_control_option (_tmp44_, _tmp45_, SANE_ACTION_SET_VALUE, &v_fixed, NULL);
+	_tmp45_ = sane_control_option (_tmp43_, _tmp44_, SANE_ACTION_SET_VALUE, &v_fixed, NULL);
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp46_;
+	status = _tmp45_;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp47_ = option_index;
+	_tmp46_ = option_index;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp48_ = value;
+	_tmp47_ = value;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp49_ = sane_status_to_string (status);
+	_tmp48_ = sane_status_to_string (status);
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp50_ = _tmp49_;
+	_tmp49_ = _tmp48_;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp51_ = SANE_UNFIX (v_fixed);
+	_tmp50_ = SANE_UNFIX (v_fixed);
 #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) _tmp47_, _tmp48_, _tmp50_, _tmp51_);
+"-> (%s, %f)", (gint) _tmp46_, _tmp47_, _tmp49_, _tmp50_);
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp50_);
+	_g_free0 (_tmp49_);
 #line 504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp52_ = SANE_UNFIX (v_fixed);
+	_tmp51_ = SANE_UNFIX (v_fixed);
 #line 504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_vala_result = _tmp52_;
+	_vala_result = _tmp51_;
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6110 "scanner.c"
+#line 6120 "scanner.c"
 	}
 }
 
@@ -6130,7 +6140,7 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 	_tmp1_ = _tmp0_->type;
 #line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SANE_TYPE_FIXED) {
-#line 6129 "scanner.c"
+#line 6139 "scanner.c"
 		SANE_Handle _tmp2_ = {0};
 		SANE_Option_Descriptor* _tmp3_ = NULL;
 		SANE_Int _tmp4_ = {0};
@@ -6148,7 +6158,7 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 		scanner_set_fixed_option (self, _tmp2_, _tmp3_, _tmp4_, _tmp5_, &_tmp6_);
 #line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_vala_result = _tmp6_;
-#line 6147 "scanner.c"
+#line 6157 "scanner.c"
 	} else {
 		SANE_Option_Descriptor* _tmp7_ = NULL;
 		SANE_Value_Type _tmp8_ = 0;
@@ -6158,7 +6168,7 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 		_tmp8_ = _tmp7_->type;
 #line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp8_ == SANE_TYPE_INT) {
-#line 6157 "scanner.c"
+#line 6167 "scanner.c"
 			gint r = 0;
 			SANE_Handle _tmp9_ = {0};
 			SANE_Option_Descriptor* _tmp10_ = NULL;
@@ -6185,20 +6195,20 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 			_tmp15_ = r;
 #line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_vala_result = (gdouble) _tmp15_;
-#line 6184 "scanner.c"
+#line 6194 "scanner.c"
 		} else {
 #line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_vala_result = 0.0;
 #line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:520: Unable to set unsupported option type");
-#line 6190 "scanner.c"
+#line 6200 "scanner.c"
 		}
 	}
 #line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
 #line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6197 "scanner.c"
+#line 6207 "scanner.c"
 	}
 }
 
@@ -6228,7 +6238,7 @@ static void scanner_set_option_to_max (Scanner* self, SANE_Handle handle, SANE_O
 	if (_tmp1_ != SANE_CONSTRAINT_RANGE) {
 #line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 6227 "scanner.c"
+#line 6237 "scanner.c"
 	}
 #line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = handle;
@@ -6255,7 +6265,7 @@ static void scanner_set_option_to_max (Scanner* self, SANE_Handle handle, SANE_O
 "on.range.max) -> (%s)", (gint) _tmp7_, _tmp10_);
 #line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp10_);
-#line 6253 "scanner.c"
+#line 6263 "scanner.c"
 }
 
 
@@ -6263,17 +6273,17 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 996 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 996 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
 	return result;
-#line 6271 "scanner.c"
+#line 6281 "scanner.c"
 }
 
 
@@ -6340,14 +6350,14 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 	_s_size_ = s_length1;
 #line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	i = 0;
-#line 6338 "scanner.c"
+#line 6348 "scanner.c"
 	{
 		gboolean _tmp6_ = FALSE;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = TRUE;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		while (TRUE) {
-#line 6345 "scanner.c"
+#line 6355 "scanner.c"
 			gboolean _tmp8_ = FALSE;
 			gint _tmp9_ = 0;
 			SANE_Option_Descriptor* _tmp10_ = NULL;
@@ -6361,13 +6371,13 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 			gchar _tmp20_ = '\0';
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp6_) {
-#line 6359 "scanner.c"
+#line 6369 "scanner.c"
 				gint _tmp7_ = 0;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = i;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = _tmp7_ + 1;
-#line 6365 "scanner.c"
+#line 6375 "scanner.c"
 			}
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = FALSE;
@@ -6379,7 +6389,7 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 			_tmp11_ = _tmp10_->size;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (((SANE_Int) _tmp9_) < (_tmp11_ - 1)) {
-#line 6377 "scanner.c"
+#line 6387 "scanner.c"
 				const gchar* _tmp12_ = NULL;
 				gint _tmp13_ = 0;
 				gchar _tmp14_ = '\0';
@@ -6391,17 +6401,17 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 				_tmp14_ = string_get (_tmp12_, (glong) _tmp13_);
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = _tmp14_ != '\0';
-#line 6389 "scanner.c"
+#line 6399 "scanner.c"
 			} else {
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = FALSE;
-#line 6393 "scanner.c"
+#line 6403 "scanner.c"
 			}
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp8_) {
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 6399 "scanner.c"
+#line 6409 "scanner.c"
 			}
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = s;
@@ -6419,7 +6429,7 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 			_tmp15_[_tmp16_] = _tmp19_;
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = _tmp15_[_tmp16_];
-#line 6417 "scanner.c"
+#line 6427 "scanner.c"
 		}
 	}
 #line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -6477,15 +6487,15 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 	if (_result_) {
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6474 "scanner.c"
+#line 6484 "scanner.c"
 	} else {
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
-#line 6478 "scanner.c"
+#line 6488 "scanner.c"
 	}
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 6482 "scanner.c"
+#line 6492 "scanner.c"
 }
 
 
@@ -6513,19 +6523,19 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 	_tmp3_ = _tmp2_->constraint_type;
 #line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp3_ == SANE_CONSTRAINT_STRING_LIST, FALSE);
-#line 6510 "scanner.c"
+#line 6520 "scanner.c"
 	{
 		gint i = 0;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 6515 "scanner.c"
+#line 6525 "scanner.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = TRUE;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 6522 "scanner.c"
+#line 6532 "scanner.c"
 				gchar** _tmp6_ = NULL;
 				gint _tmp6__length1 = 0;
 				gint _tmp7_ = 0;
@@ -6538,13 +6548,13 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 				const gchar* _tmp25_ = NULL;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp4_) {
-#line 6535 "scanner.c"
+#line 6545 "scanner.c"
 					gint _tmp5_ = 0;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp5_ = i;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp5_ + 1;
-#line 6541 "scanner.c"
+#line 6551 "scanner.c"
 				}
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp4_ = FALSE;
@@ -6560,18 +6570,18 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 				if (!(_tmp8_ != NULL)) {
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 6557 "scanner.c"
+#line 6567 "scanner.c"
 				}
 #line 558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				j = 0;
-#line 6561 "scanner.c"
+#line 6571 "scanner.c"
 				{
 					gboolean _tmp9_ = FALSE;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = TRUE;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 6568 "scanner.c"
+#line 6578 "scanner.c"
 						SANE_Option_Descriptor* _tmp11_ = NULL;
 						gchar** _tmp12_ = NULL;
 						gint _tmp12__length1 = 0;
@@ -6588,13 +6598,13 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 						const gchar* _tmp21_ = NULL;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp9_) {
-#line 6585 "scanner.c"
+#line 6595 "scanner.c"
 							gint _tmp10_ = 0;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp10_ = j;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							j = _tmp10_ + 1;
-#line 6591 "scanner.c"
+#line 6601 "scanner.c"
 						}
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp9_ = FALSE;
@@ -6612,7 +6622,7 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 						if (!(_tmp14_ != NULL)) {
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6609 "scanner.c"
+#line 6619 "scanner.c"
 						}
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp15_ = values;
@@ -6636,7 +6646,7 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 						if (g_strcmp0 (_tmp17_, _tmp21_) == 0) {
 #line 562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6633 "scanner.c"
+#line 6643 "scanner.c"
 						}
 					}
 				}
@@ -6652,7 +6662,7 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 				_tmp25_ = _tmp23_[_tmp24_];
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp25_ != NULL) {
-#line 6649 "scanner.c"
+#line 6659 "scanner.c"
 					SANE_Handle _tmp26_ = {0};
 					SANE_Option_Descriptor* _tmp27_ = NULL;
 					SANE_Int _tmp28_ = {0};
@@ -6688,15 +6698,15 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 					if (_result_) {
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						*_result_ = _vala_result;
-#line 6685 "scanner.c"
+#line 6695 "scanner.c"
 					} else {
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (_vala_result);
-#line 6689 "scanner.c"
+#line 6699 "scanner.c"
 					}
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
-#line 6693 "scanner.c"
+#line 6703 "scanner.c"
 				}
 			}
 		}
@@ -6713,15 +6723,15 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 	if (_result_) {
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6710 "scanner.c"
+#line 6720 "scanner.c"
 	} else {
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
-#line 6714 "scanner.c"
+#line 6724 "scanner.c"
 	}
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 6718 "scanner.c"
+#line 6728 "scanner.c"
 }
 
 
@@ -6768,7 +6778,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	_tmp3_ = _tmp2_->name;
 #line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp3_, "") != 0) {
-#line 6765 "scanner.c"
+#line 6775 "scanner.c"
 		const gchar* _tmp4_ = NULL;
 		SANE_Option_Descriptor* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -6793,7 +6803,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		s = _tmp9_;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp8_);
-#line 6790 "scanner.c"
+#line 6800 "scanner.c"
 	}
 #line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = option;
@@ -6801,7 +6811,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	_tmp11_ = _tmp10_->title;
 #line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp11_, "") != 0) {
-#line 6798 "scanner.c"
+#line 6808 "scanner.c"
 		const gchar* _tmp12_ = NULL;
 		SANE_Option_Descriptor* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
@@ -6826,7 +6836,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		s = _tmp17_;
 #line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp16_);
-#line 6823 "scanner.c"
+#line 6833 "scanner.c"
 	}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = option;
@@ -6836,7 +6846,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	switch (_tmp19_) {
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BOOL:
-#line 6833 "scanner.c"
+#line 6843 "scanner.c"
 		{
 			const gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
@@ -6850,11 +6860,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp21_;
 #line 587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6847 "scanner.c"
+#line 6857 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_INT:
-#line 6851 "scanner.c"
+#line 6861 "scanner.c"
 		{
 			const gchar* _tmp22_ = NULL;
 			gchar* _tmp23_ = NULL;
@@ -6868,11 +6878,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp23_;
 #line 590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6865 "scanner.c"
+#line 6875 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_FIXED:
-#line 6869 "scanner.c"
+#line 6879 "scanner.c"
 		{
 			const gchar* _tmp24_ = NULL;
 			gchar* _tmp25_ = NULL;
@@ -6886,11 +6896,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp25_;
 #line 593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6883 "scanner.c"
+#line 6893 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_STRING:
-#line 6887 "scanner.c"
+#line 6897 "scanner.c"
 		{
 			const gchar* _tmp26_ = NULL;
 			gchar* _tmp27_ = NULL;
@@ -6904,11 +6914,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp27_;
 #line 596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6901 "scanner.c"
+#line 6911 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BUTTON:
-#line 6905 "scanner.c"
+#line 6915 "scanner.c"
 		{
 			const gchar* _tmp28_ = NULL;
 			gchar* _tmp29_ = NULL;
@@ -6922,11 +6932,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp29_;
 #line 599 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6919 "scanner.c"
+#line 6929 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_GROUP:
-#line 6923 "scanner.c"
+#line 6933 "scanner.c"
 		{
 			const gchar* _tmp30_ = NULL;
 			gchar* _tmp31_ = NULL;
@@ -6940,7 +6950,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp31_;
 #line 602 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6937 "scanner.c"
+#line 6947 "scanner.c"
 		}
 		default:
 		{
@@ -6970,7 +6980,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_g_free0 (_tmp36_);
 #line 605 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6967 "scanner.c"
+#line 6977 "scanner.c"
 		}
 	}
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -6999,15 +7009,15 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	switch (_tmp45_) {
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_NONE:
-#line 6996 "scanner.c"
+#line 7006 "scanner.c"
 		{
 #line 613 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7000 "scanner.c"
+#line 7010 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PIXEL:
-#line 7004 "scanner.c"
+#line 7014 "scanner.c"
 		{
 			const gchar* _tmp46_ = NULL;
 			gchar* _tmp47_ = NULL;
@@ -7021,11 +7031,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp47_;
 #line 616 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7018 "scanner.c"
+#line 7028 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_BIT:
-#line 7022 "scanner.c"
+#line 7032 "scanner.c"
 		{
 			const gchar* _tmp48_ = NULL;
 			gchar* _tmp49_ = NULL;
@@ -7039,11 +7049,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp49_;
 #line 619 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7036 "scanner.c"
+#line 7046 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MM:
-#line 7040 "scanner.c"
+#line 7050 "scanner.c"
 		{
 			const gchar* _tmp50_ = NULL;
 			gchar* _tmp51_ = NULL;
@@ -7057,11 +7067,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp51_;
 #line 622 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7054 "scanner.c"
+#line 7064 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_DPI:
-#line 7058 "scanner.c"
+#line 7068 "scanner.c"
 		{
 			const gchar* _tmp52_ = NULL;
 			gchar* _tmp53_ = NULL;
@@ -7075,11 +7085,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp53_;
 #line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7072 "scanner.c"
+#line 7082 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PERCENT:
-#line 7076 "scanner.c"
+#line 7086 "scanner.c"
 		{
 			const gchar* _tmp54_ = NULL;
 			gchar* _tmp55_ = NULL;
@@ -7093,11 +7103,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp55_;
 #line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7090 "scanner.c"
+#line 7100 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MICROSECOND:
-#line 7094 "scanner.c"
+#line 7104 "scanner.c"
 		{
 			const gchar* _tmp56_ = NULL;
 			gchar* _tmp57_ = NULL;
@@ -7111,7 +7121,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp57_;
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7108 "scanner.c"
+#line 7118 "scanner.c"
 		}
 		default:
 		{
@@ -7141,7 +7151,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_g_free0 (_tmp62_);
 #line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7138 "scanner.c"
+#line 7148 "scanner.c"
 		}
 	}
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7152,7 +7162,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	switch (_tmp65_) {
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_RANGE:
-#line 7149 "scanner.c"
+#line 7159 "scanner.c"
 		{
 			SANE_Option_Descriptor* _tmp66_ = NULL;
 			SANE_Value_Type _tmp67_ = 0;
@@ -7162,7 +7172,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp67_ = _tmp66_->type;
 #line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp67_ == SANE_TYPE_FIXED) {
-#line 7159 "scanner.c"
+#line 7169 "scanner.c"
 				const gchar* _tmp68_ = NULL;
 				SANE_Option_Descriptor* _tmp69_ = NULL;
 				SANE_Range* _tmp70_ = NULL;
@@ -7214,7 +7224,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				s = _tmp82_;
 #line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp81_);
-#line 7211 "scanner.c"
+#line 7221 "scanner.c"
 			} else {
 				const gchar* _tmp83_ = NULL;
 				SANE_Option_Descriptor* _tmp84_ = NULL;
@@ -7261,15 +7271,15 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				s = _tmp95_;
 #line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp94_);
-#line 7258 "scanner.c"
+#line 7268 "scanner.c"
 			}
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7262 "scanner.c"
+#line 7272 "scanner.c"
 		}
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_WORD_LIST:
-#line 7266 "scanner.c"
+#line 7276 "scanner.c"
 		{
 			const gchar* _tmp96_ = NULL;
 			gchar* _tmp97_ = NULL;
@@ -7283,19 +7293,19 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_g_free0 (s);
 #line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp97_;
-#line 7280 "scanner.c"
+#line 7290 "scanner.c"
 			{
 				gint i = 0;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 7285 "scanner.c"
+#line 7295 "scanner.c"
 				{
 					gboolean _tmp98_ = FALSE;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp98_ = TRUE;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 7292 "scanner.c"
+#line 7302 "scanner.c"
 						gint _tmp100_ = 0;
 						SANE_Option_Descriptor* _tmp101_ = NULL;
 						SANE_Word* _tmp102_ = NULL;
@@ -7306,13 +7316,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						SANE_Value_Type _tmp108_ = 0;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp98_) {
-#line 7303 "scanner.c"
+#line 7313 "scanner.c"
 							gint _tmp99_ = 0;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp99_ = i;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp99_ + 1;
-#line 7309 "scanner.c"
+#line 7319 "scanner.c"
 						}
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp98_ = FALSE;
@@ -7330,13 +7340,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						if (!(((SANE_Word) _tmp100_) < _tmp103_)) {
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 7327 "scanner.c"
+#line 7337 "scanner.c"
 						}
 #line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp104_ = i;
 #line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp104_ != 0) {
-#line 7333 "scanner.c"
+#line 7343 "scanner.c"
 							const gchar* _tmp105_ = NULL;
 							gchar* _tmp106_ = NULL;
 #line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7347,7 +7357,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							_g_free0 (s);
 #line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp106_;
-#line 7344 "scanner.c"
+#line 7354 "scanner.c"
 						}
 #line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp107_ = option;
@@ -7355,7 +7365,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						_tmp108_ = _tmp107_->type;
 #line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp108_ == SANE_TYPE_INT) {
-#line 7352 "scanner.c"
+#line 7362 "scanner.c"
 							const gchar* _tmp109_ = NULL;
 							SANE_Option_Descriptor* _tmp110_ = NULL;
 							SANE_Word* _tmp111_ = NULL;
@@ -7389,7 +7399,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							s = _tmp116_;
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (_tmp115_);
-#line 7386 "scanner.c"
+#line 7396 "scanner.c"
 						} else {
 							const gchar* _tmp117_ = NULL;
 							SANE_Option_Descriptor* _tmp118_ = NULL;
@@ -7427,7 +7437,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							s = _tmp125_;
 #line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (_tmp124_);
-#line 7424 "scanner.c"
+#line 7434 "scanner.c"
 						}
 					}
 				}
@@ -7442,11 +7452,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp127_;
 #line 657 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7439 "scanner.c"
+#line 7449 "scanner.c"
 		}
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_STRING_LIST:
-#line 7443 "scanner.c"
+#line 7453 "scanner.c"
 		{
 			const gchar* _tmp128_ = NULL;
 			gchar* _tmp129_ = NULL;
@@ -7460,19 +7470,19 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_g_free0 (s);
 #line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp129_;
-#line 7457 "scanner.c"
+#line 7467 "scanner.c"
 			{
 				gint i = 0;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 7462 "scanner.c"
+#line 7472 "scanner.c"
 				{
 					gboolean _tmp130_ = FALSE;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp130_ = TRUE;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 7469 "scanner.c"
+#line 7479 "scanner.c"
 						SANE_Option_Descriptor* _tmp132_ = NULL;
 						gchar** _tmp133_ = NULL;
 						gint _tmp133__length1 = 0;
@@ -7490,13 +7500,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						gchar* _tmp146_ = NULL;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp130_) {
-#line 7487 "scanner.c"
+#line 7497 "scanner.c"
 							gint _tmp131_ = 0;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp131_ = i;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp131_ + 1;
-#line 7493 "scanner.c"
+#line 7503 "scanner.c"
 						}
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp130_ = FALSE;
@@ -7514,13 +7524,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						if (!(_tmp135_ != NULL)) {
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 7511 "scanner.c"
+#line 7521 "scanner.c"
 						}
 #line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp136_ = i;
 #line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp136_ != 0) {
-#line 7517 "scanner.c"
+#line 7527 "scanner.c"
 							const gchar* _tmp137_ = NULL;
 							gchar* _tmp138_ = NULL;
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7531,7 +7541,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							_g_free0 (s);
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp138_;
-#line 7528 "scanner.c"
+#line 7538 "scanner.c"
 						}
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp139_ = s;
@@ -7557,7 +7567,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						s = _tmp146_;
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (_tmp145_);
-#line 7554 "scanner.c"
+#line 7564 "scanner.c"
 					}
 				}
 			}
@@ -7571,13 +7581,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp148_;
 #line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7568 "scanner.c"
+#line 7578 "scanner.c"
 		}
 		default:
 		{
 #line 669 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7574 "scanner.c"
+#line 7584 "scanner.c"
 		}
 	}
 #line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7590,7 +7600,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	_tmp151_ = cap;
 #line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp151_ != ((SANE_Int) 0)) {
-#line 7587 "scanner.c"
+#line 7597 "scanner.c"
 		const gchar* _tmp152_ = NULL;
 		gchar* _tmp153_ = NULL;
 		SANE_Int _tmp154_ = {0};
@@ -7613,7 +7623,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		_tmp154_ = cap;
 #line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp154_ & SANE_CAP_SOFT_SELECT) != ((SANE_Int) 0)) {
-#line 7610 "scanner.c"
+#line 7620 "scanner.c"
 			const gchar* _tmp155_ = NULL;
 			const gchar* _tmp158_ = NULL;
 			gchar* _tmp159_ = NULL;
@@ -7622,7 +7632,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp155_ = s;
 #line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp155_, "") != 0) {
-#line 7619 "scanner.c"
+#line 7629 "scanner.c"
 				const gchar* _tmp156_ = NULL;
 				gchar* _tmp157_ = NULL;
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7633,7 +7643,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp157_;
-#line 7630 "scanner.c"
+#line 7640 "scanner.c"
 			}
 #line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp158_ = s;
@@ -7647,13 +7657,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp160_ = cap;
 #line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp160_ & (~SANE_CAP_SOFT_SELECT);
-#line 7644 "scanner.c"
+#line 7654 "scanner.c"
 		}
 #line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp161_ = cap;
 #line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp161_ & SANE_CAP_HARD_SELECT) != ((SANE_Int) 0)) {
-#line 7650 "scanner.c"
+#line 7660 "scanner.c"
 			const gchar* _tmp162_ = NULL;
 			const gchar* _tmp165_ = NULL;
 			gchar* _tmp166_ = NULL;
@@ -7662,7 +7672,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp162_ = s;
 #line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp162_, "") != 0) {
-#line 7659 "scanner.c"
+#line 7669 "scanner.c"
 				const gchar* _tmp163_ = NULL;
 				gchar* _tmp164_ = NULL;
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7673,7 +7683,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp164_;
-#line 7670 "scanner.c"
+#line 7680 "scanner.c"
 			}
 #line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp165_ = s;
@@ -7687,13 +7697,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp167_ = cap;
 #line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp167_ & (~SANE_CAP_HARD_SELECT);
-#line 7684 "scanner.c"
+#line 7694 "scanner.c"
 		}
 #line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp168_ = cap;
 #line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp168_ & SANE_CAP_SOFT_DETECT) != ((SANE_Int) 0)) {
-#line 7690 "scanner.c"
+#line 7700 "scanner.c"
 			const gchar* _tmp169_ = NULL;
 			const gchar* _tmp172_ = NULL;
 			gchar* _tmp173_ = NULL;
@@ -7702,7 +7712,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp169_ = s;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp169_, "") != 0) {
-#line 7699 "scanner.c"
+#line 7709 "scanner.c"
 				const gchar* _tmp170_ = NULL;
 				gchar* _tmp171_ = NULL;
 #line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7713,7 +7723,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp171_;
-#line 7710 "scanner.c"
+#line 7720 "scanner.c"
 			}
 #line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp172_ = s;
@@ -7727,13 +7737,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp174_ = cap;
 #line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp174_ & (~SANE_CAP_SOFT_DETECT);
-#line 7724 "scanner.c"
+#line 7734 "scanner.c"
 		}
 #line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp175_ = cap;
 #line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp175_ & SANE_CAP_EMULATED) != ((SANE_Int) 0)) {
-#line 7730 "scanner.c"
+#line 7740 "scanner.c"
 			const gchar* _tmp176_ = NULL;
 			const gchar* _tmp179_ = NULL;
 			gchar* _tmp180_ = NULL;
@@ -7742,7 +7752,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp176_ = s;
 #line 699 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp176_, "") != 0) {
-#line 7739 "scanner.c"
+#line 7749 "scanner.c"
 				const gchar* _tmp177_ = NULL;
 				gchar* _tmp178_ = NULL;
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7753,7 +7763,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp178_;
-#line 7750 "scanner.c"
+#line 7760 "scanner.c"
 			}
 #line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp179_ = s;
@@ -7767,13 +7777,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp181_ = cap;
 #line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp181_ & (~SANE_CAP_EMULATED);
-#line 7764 "scanner.c"
+#line 7774 "scanner.c"
 		}
 #line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp182_ = cap;
 #line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp182_ & SANE_CAP_AUTOMATIC) != ((SANE_Int) 0)) {
-#line 7770 "scanner.c"
+#line 7780 "scanner.c"
 			const gchar* _tmp183_ = NULL;
 			const gchar* _tmp186_ = NULL;
 			gchar* _tmp187_ = NULL;
@@ -7782,7 +7792,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp183_ = s;
 #line 706 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp183_, "") != 0) {
-#line 7779 "scanner.c"
+#line 7789 "scanner.c"
 				const gchar* _tmp184_ = NULL;
 				gchar* _tmp185_ = NULL;
 #line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7793,7 +7803,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp185_;
-#line 7790 "scanner.c"
+#line 7800 "scanner.c"
 			}
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp186_ = s;
@@ -7807,13 +7817,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp188_ = cap;
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp188_ & (~SANE_CAP_AUTOMATIC);
-#line 7804 "scanner.c"
+#line 7814 "scanner.c"
 		}
 #line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp189_ = cap;
 #line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp189_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
-#line 7810 "scanner.c"
+#line 7820 "scanner.c"
 			const gchar* _tmp190_ = NULL;
 			const gchar* _tmp193_ = NULL;
 			gchar* _tmp194_ = NULL;
@@ -7822,7 +7832,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp190_ = s;
 #line 713 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp190_, "") != 0) {
-#line 7819 "scanner.c"
+#line 7829 "scanner.c"
 				const gchar* _tmp191_ = NULL;
 				gchar* _tmp192_ = NULL;
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7833,7 +7843,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp192_;
-#line 7830 "scanner.c"
+#line 7840 "scanner.c"
 			}
 #line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp193_ = s;
@@ -7847,13 +7857,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp195_ = cap;
 #line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp195_ & (~SANE_CAP_INACTIVE);
-#line 7844 "scanner.c"
+#line 7854 "scanner.c"
 		}
 #line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp196_ = cap;
 #line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp196_ & SANE_CAP_ADVANCED) != ((SANE_Int) 0)) {
-#line 7850 "scanner.c"
+#line 7860 "scanner.c"
 			const gchar* _tmp197_ = NULL;
 			const gchar* _tmp200_ = NULL;
 			gchar* _tmp201_ = NULL;
@@ -7862,7 +7872,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp197_ = s;
 #line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp197_, "") != 0) {
-#line 7859 "scanner.c"
+#line 7869 "scanner.c"
 				const gchar* _tmp198_ = NULL;
 				gchar* _tmp199_ = NULL;
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7873,7 +7883,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp199_;
-#line 7870 "scanner.c"
+#line 7880 "scanner.c"
 			}
 #line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp200_ = s;
@@ -7887,13 +7897,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp202_ = cap;
 #line 723 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp202_ & (~SANE_CAP_ADVANCED);
-#line 7884 "scanner.c"
+#line 7894 "scanner.c"
 		}
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp203_ = cap;
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp203_ != ((SANE_Int) 0)) {
-#line 7890 "scanner.c"
+#line 7900 "scanner.c"
 			const gchar* _tmp204_ = NULL;
 			const gchar* _tmp207_ = NULL;
 			SANE_Int _tmp208_ = {0};
@@ -7904,7 +7914,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp204_ = s;
 #line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp204_, "") != 0) {
-#line 7901 "scanner.c"
+#line 7911 "scanner.c"
 				const gchar* _tmp205_ = NULL;
 				gchar* _tmp206_ = NULL;
 #line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7915,7 +7925,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp206_;
-#line 7912 "scanner.c"
+#line 7922 "scanner.c"
 			}
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp207_ = s;
@@ -7933,7 +7943,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp211_;
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp210_);
-#line 7930 "scanner.c"
+#line 7940 "scanner.c"
 		}
 	}
 #line 734 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7946,7 +7956,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	_tmp214_ = _tmp213_->desc;
 #line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp214_ != NULL) {
-#line 7943 "scanner.c"
+#line 7953 "scanner.c"
 		SANE_Option_Descriptor* _tmp215_ = NULL;
 		const gchar* _tmp216_ = NULL;
 #line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7955,11 +7965,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		_tmp216_ = _tmp215_->desc;
 #line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:737:   Description: %s", _tmp216_);
-#line 7952 "scanner.c"
+#line 7962 "scanner.c"
 	}
 #line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (s);
-#line 7956 "scanner.c"
+#line 7966 "scanner.c"
 }
 
 
@@ -7994,19 +8004,19 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 	_tmp6_ = g_async_queue_pop (_tmp5_);
 #line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials = (Credentials*) _tmp6_;
-#line 7991 "scanner.c"
+#line 8001 "scanner.c"
 	{
 		gint i = 0;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 7996 "scanner.c"
+#line 8006 "scanner.c"
 		{
 			gboolean _tmp7_ = FALSE;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = TRUE;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 8003 "scanner.c"
+#line 8013 "scanner.c"
 				gboolean _tmp9_ = FALSE;
 				Credentials* _tmp10_ = NULL;
 				const gchar* _tmp11_ = NULL;
@@ -8022,13 +8032,13 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				gchar _tmp22_ = '\0';
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp7_) {
-#line 8019 "scanner.c"
+#line 8029 "scanner.c"
 					gint _tmp8_ = 0;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp8_ = i;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp8_ + 1;
-#line 8025 "scanner.c"
+#line 8035 "scanner.c"
 				}
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = FALSE;
@@ -8042,7 +8052,7 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				_tmp13_ = string_get (_tmp11_, (glong) _tmp12_);
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp13_ != '\0') {
-#line 8039 "scanner.c"
+#line 8049 "scanner.c"
 					gint _tmp14_ = 0;
 					gint _tmp15_ = 0;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8051,17 +8061,17 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 					_tmp15_ = SANE_MAX_USERNAME_LEN;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = _tmp14_ < _tmp15_;
-#line 8048 "scanner.c"
+#line 8058 "scanner.c"
 				} else {
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = FALSE;
-#line 8052 "scanner.c"
+#line 8062 "scanner.c"
 				}
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp9_) {
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 8058 "scanner.c"
+#line 8068 "scanner.c"
 				}
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_ = username;
@@ -8081,7 +8091,7 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				_tmp16_[_tmp17_] = _tmp21_;
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22_ = _tmp16_[_tmp17_];
-#line 8078 "scanner.c"
+#line 8088 "scanner.c"
 			}
 		}
 	}
@@ -8089,14 +8099,14 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 		gint i = 0;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 8086 "scanner.c"
+#line 8096 "scanner.c"
 		{
 			gboolean _tmp23_ = FALSE;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = TRUE;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 8093 "scanner.c"
+#line 8103 "scanner.c"
 				gboolean _tmp25_ = FALSE;
 				Credentials* _tmp26_ = NULL;
 				const gchar* _tmp27_ = NULL;
@@ -8112,13 +8122,13 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				gchar _tmp38_ = '\0';
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp23_) {
-#line 8109 "scanner.c"
+#line 8119 "scanner.c"
 					gint _tmp24_ = 0;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp24_ = i;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp24_ + 1;
-#line 8115 "scanner.c"
+#line 8125 "scanner.c"
 				}
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp23_ = FALSE;
@@ -8132,7 +8142,7 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				_tmp29_ = string_get (_tmp27_, (glong) _tmp28_);
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp29_ != '\0') {
-#line 8129 "scanner.c"
+#line 8139 "scanner.c"
 					gint _tmp30_ = 0;
 					gint _tmp31_ = 0;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8141,17 +8151,17 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 					_tmp31_ = SANE_MAX_USERNAME_LEN;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp25_ = _tmp30_ < _tmp31_;
-#line 8138 "scanner.c"
+#line 8148 "scanner.c"
 				} else {
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp25_ = FALSE;
-#line 8142 "scanner.c"
+#line 8152 "scanner.c"
 				}
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp25_) {
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 8148 "scanner.c"
+#line 8158 "scanner.c"
 				}
 #line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32_ = password;
@@ -8171,20 +8181,20 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				_tmp32_[_tmp33_] = _tmp37_;
 #line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp38_ = _tmp32_[_tmp33_];
-#line 8168 "scanner.c"
+#line 8178 "scanner.c"
 			}
 		}
 	}
 #line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
-#line 8174 "scanner.c"
+#line 8184 "scanner.c"
 }
 
 
 static gpointer _credentials_ref0 (gpointer self) {
 #line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? credentials_ref (self) : NULL;
-#line 8181 "scanner.c"
+#line 8191 "scanner.c"
 }
 
 
@@ -8231,7 +8241,7 @@ void scanner_authorize (Scanner* self, const gchar* username, const gchar* passw
 	g_async_queue_push (_tmp5_, _tmp6_);
 #line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
-#line 8228 "scanner.c"
+#line 8238 "scanner.c"
 }
 
 
@@ -8243,7 +8253,7 @@ static void scanner_close_device (Scanner* self) {
 	_tmp0_ = self->priv->have_handle;
 #line 761 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 8240 "scanner.c"
+#line 8250 "scanner.c"
 		SANE_Handle _tmp1_ = {0};
 		SANE_Handle _tmp2_ = {0};
 #line 763 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8264,7 +8274,7 @@ static void scanner_close_device (Scanner* self) {
 		_g_hash_table_unref0 (self->priv->options);
 #line 769 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->options = NULL;
-#line 8261 "scanner.c"
+#line 8271 "scanner.c"
 	}
 #line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
@@ -8280,7 +8290,7 @@ static void scanner_close_device (Scanner* self) {
 	self->priv->job_queue = NULL;
 #line 775 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
-#line 8277 "scanner.c"
+#line 8287 "scanner.c"
 }
 
 
@@ -8309,21 +8319,21 @@ static void scanner_fail_scan (Scanner* self, gint error_code, const gchar* erro
 	scanner_notify (self, (Notify*) _tmp3_);
 #line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp3_);
-#line 8306 "scanner.c"
+#line 8316 "scanner.c"
 }
 
 
 static gpointer _request_ref0 (gpointer self) {
 #line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? request_ref (self) : NULL;
-#line 8313 "scanner.c"
+#line 8323 "scanner.c"
 }
 
 
 static gpointer _scan_job_ref0 (gpointer self) {
 #line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_job_ref (self) : NULL;
-#line 8320 "scanner.c"
+#line 8330 "scanner.c"
 }
 
 
@@ -8338,29 +8348,29 @@ static gboolean scanner_handle_requests (Scanner* self) {
 	_tmp1_ = self->priv->state;
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SCAN_STATE_IDLE) {
-#line 8335 "scanner.c"
+#line 8345 "scanner.c"
 		gboolean _tmp2_ = FALSE;
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = self->priv->need_redetect;
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
-#line 8341 "scanner.c"
+#line 8351 "scanner.c"
 	} else {
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 8345 "scanner.c"
+#line 8355 "scanner.c"
 	}
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
 #line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_REDETECT;
-#line 8351 "scanner.c"
+#line 8361 "scanner.c"
 	}
 #line 792 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_count = 0;
 #line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
-#line 8357 "scanner.c"
+#line 8367 "scanner.c"
 		Request* request = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
@@ -8371,23 +8381,23 @@ static gboolean scanner_handle_requests (Scanner* self) {
 		_tmp5_ = self->priv->state;
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp5_ == SCAN_STATE_IDLE) {
-#line 8368 "scanner.c"
+#line 8378 "scanner.c"
 			gint _tmp6_ = 0;
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = request_count;
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = _tmp6_ == 0;
-#line 8374 "scanner.c"
+#line 8384 "scanner.c"
 		} else {
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = FALSE;
-#line 8378 "scanner.c"
+#line 8388 "scanner.c"
 		}
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp4_) {
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = TRUE;
-#line 8384 "scanner.c"
+#line 8394 "scanner.c"
 		} else {
 			GAsyncQueue* _tmp7_ = NULL;
 			gint _tmp8_ = 0;
@@ -8397,11 +8407,11 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			_tmp8_ = g_async_queue_length (_tmp7_);
 #line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = _tmp8_ > 0;
-#line 8394 "scanner.c"
+#line 8404 "scanner.c"
 		}
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp3_) {
-#line 8398 "scanner.c"
+#line 8408 "scanner.c"
 			GAsyncQueue* _tmp9_ = NULL;
 			gpointer _tmp10_ = NULL;
 #line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8412,7 +8422,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			_request_unref0 (request);
 #line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			request = (Request*) _tmp10_;
-#line 8409 "scanner.c"
+#line 8419 "scanner.c"
 		} else {
 #line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = TRUE;
@@ -8420,7 +8430,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			_request_unref0 (request);
 #line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 8417 "scanner.c"
+#line 8427 "scanner.c"
 		}
 #line 802 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:802: Processing request");
@@ -8432,7 +8442,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 		_tmp12_ = request;
 #line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_REQUEST_START_SCAN)) {
-#line 8429 "scanner.c"
+#line 8439 "scanner.c"
 			RequestStartScan* r = NULL;
 			Request* _tmp13_ = NULL;
 			RequestStartScan* _tmp14_ = NULL;
@@ -8455,7 +8465,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			self->priv->job_queue = g_list_append (self->priv->job_queue, _tmp17_);
 #line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (r);
-#line 8452 "scanner.c"
+#line 8462 "scanner.c"
 		} else {
 			Request* _tmp18_ = NULL;
 #line 810 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8464,7 +8474,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_REQUEST_CANCEL)) {
 #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 8461 "scanner.c"
+#line 8471 "scanner.c"
 			} else {
 				Request* _tmp19_ = NULL;
 #line 814 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8479,13 +8489,13 @@ static gboolean scanner_handle_requests (Scanner* self) {
 					_request_unref0 (request);
 #line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
-#line 8476 "scanner.c"
+#line 8486 "scanner.c"
 				}
 			}
 		}
 #line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_request_unref0 (request);
-#line 8482 "scanner.c"
+#line 8492 "scanner.c"
 	}
 }
 
@@ -8493,7 +8503,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 static void _g_free0_ (gpointer var) {
 #line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	var = (g_free (var), NULL);
-#line 8490 "scanner.c"
+#line 8500 "scanner.c"
 }
 
 
@@ -8551,21 +8561,21 @@ static void scanner_do_open (Scanner* self) {
 	_tmp5_ = _tmp4_->device;
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ == NULL) {
-#line 8548 "scanner.c"
+#line 8558 "scanner.c"
 		const gchar* _tmp6_ = NULL;
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = self->priv->default_device;
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = _tmp6_ != NULL;
-#line 8554 "scanner.c"
+#line 8564 "scanner.c"
 	} else {
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = FALSE;
-#line 8558 "scanner.c"
+#line 8568 "scanner.c"
 	}
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp3_) {
-#line 8562 "scanner.c"
+#line 8572 "scanner.c"
 		ScanJob* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -8579,7 +8589,7 @@ static void scanner_do_open (Scanner* self) {
 		_g_free0 (_tmp7_->device);
 #line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_->device = _tmp9_;
-#line 8576 "scanner.c"
+#line 8586 "scanner.c"
 	}
 #line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = job;
@@ -8587,7 +8597,7 @@ static void scanner_do_open (Scanner* self) {
 	_tmp11_ = _tmp10_->device;
 #line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp11_ == NULL) {
-#line 8584 "scanner.c"
+#line 8594 "scanner.c"
 		const gchar* _tmp12_ = NULL;
 #line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:837: No scan device available");
@@ -8599,13 +8609,13 @@ static void scanner_do_open (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 8596 "scanner.c"
+#line 8606 "scanner.c"
 	}
 #line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = self->priv->have_handle;
 #line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp13_) {
-#line 8602 "scanner.c"
+#line 8612 "scanner.c"
 		const gchar* _tmp14_ = NULL;
 		ScanJob* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
@@ -8624,7 +8634,7 @@ static void scanner_do_open (Scanner* self) {
 			_scan_job_unref0 (job);
 #line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return;
-#line 8621 "scanner.c"
+#line 8631 "scanner.c"
 		}
 #line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = self->priv->handle;
@@ -8634,7 +8644,7 @@ static void scanner_do_open (Scanner* self) {
 		g_debug ("scanner.vala:854: sane_close ()");
 #line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->have_handle = FALSE;
-#line 8631 "scanner.c"
+#line 8641 "scanner.c"
 	}
 #line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
@@ -8680,7 +8690,7 @@ static void scanner_do_open (Scanner* self) {
 	_tmp30_ = status;
 #line 865 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp30_ != SANE_STATUS_GOOD) {
-#line 8677 "scanner.c"
+#line 8687 "scanner.c"
 		SANE_Status _tmp31_ = 0;
 		const gchar* _tmp32_ = NULL;
 		SANE_Status _tmp33_ = 0;
@@ -8701,7 +8711,7 @@ static void scanner_do_open (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 871 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 8698 "scanner.c"
+#line 8708 "scanner.c"
 	}
 #line 873 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->have_handle = TRUE;
@@ -8719,7 +8729,7 @@ static void scanner_do_open (Scanner* self) {
 	self->priv->state = SCAN_STATE_GET_OPTION;
 #line 822 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 8716 "scanner.c"
+#line 8726 "scanner.c"
 }
 
 
@@ -8784,7 +8794,7 @@ static void scanner_do_get_option (Scanner* self) {
 	_tmp9_ = option;
 #line 889 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ == NULL) {
-#line 8781 "scanner.c"
+#line 8791 "scanner.c"
 		SANE_Handle _tmp10_ = {0};
 		const gchar* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
@@ -8860,7 +8870,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp14_ = option;
 #line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp14_ == NULL) {
-#line 8857 "scanner.c"
+#line 8867 "scanner.c"
 			SANE_Handle _tmp15_ = {0};
 			gint _tmp16_ = 0;
 			SANE_Option_Descriptor* _tmp17_ = NULL;
@@ -8875,13 +8885,13 @@ static void scanner_do_get_option (Scanner* self) {
 			index = (SANE_Int) _tmp16_;
 #line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp17_;
-#line 8871 "scanner.c"
+#line 8881 "scanner.c"
 		}
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp18_ = option;
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp18_ != NULL) {
-#line 8877 "scanner.c"
+#line 8887 "scanner.c"
 			gchar** flatbed_sources = NULL;
 			gchar* _tmp19_ = NULL;
 			const gchar* _tmp20_ = NULL;
@@ -9093,7 +9103,7 @@ static void scanner_do_get_option (Scanner* self) {
 			switch (_tmp56_) {
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_SINGLE:
-#line 9089 "scanner.c"
+#line 9099 "scanner.c"
 				{
 					SANE_Handle _tmp57_ = {0};
 					SANE_Option_Descriptor* _tmp58_ = NULL;
@@ -9109,7 +9119,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp60_ = scanner_set_default_option (self, _tmp57_, _tmp58_, _tmp59_);
 #line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp60_) {
-#line 9105 "scanner.c"
+#line 9115 "scanner.c"
 						SANE_Handle _tmp61_ = {0};
 						SANE_Option_Descriptor* _tmp62_ = NULL;
 						SANE_Int _tmp63_ = {0};
@@ -9132,16 +9142,16 @@ static void scanner_do_get_option (Scanner* self) {
 						if (!_tmp65_) {
 #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 9128 "scanner.c"
+#line 9138 "scanner.c"
 						}
 					}
 #line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9133 "scanner.c"
+#line 9143 "scanner.c"
 				}
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_FRONT:
-#line 9137 "scanner.c"
+#line 9147 "scanner.c"
 				{
 					SANE_Handle _tmp66_ = {0};
 					SANE_Option_Descriptor* _tmp67_ = NULL;
@@ -9163,7 +9173,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp70_ = scanner_set_constrained_string_option (self, _tmp66_, _tmp67_, _tmp68_, _tmp69_, _tmp69__length1, NULL);
 #line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp70_) {
-#line 9159 "scanner.c"
+#line 9169 "scanner.c"
 						SANE_Handle _tmp71_ = {0};
 						SANE_Option_Descriptor* _tmp72_ = NULL;
 						SANE_Int _tmp73_ = {0};
@@ -9186,16 +9196,16 @@ static void scanner_do_get_option (Scanner* self) {
 						if (!_tmp75_) {
 #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 9182 "scanner.c"
+#line 9192 "scanner.c"
 						}
 					}
 #line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9187 "scanner.c"
+#line 9197 "scanner.c"
 				}
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BACK:
-#line 9191 "scanner.c"
+#line 9201 "scanner.c"
 				{
 					SANE_Handle _tmp76_ = {0};
 					SANE_Option_Descriptor* _tmp77_ = NULL;
@@ -9217,7 +9227,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp80_ = scanner_set_constrained_string_option (self, _tmp76_, _tmp77_, _tmp78_, _tmp79_, _tmp79__length1, NULL);
 #line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp80_) {
-#line 9213 "scanner.c"
+#line 9223 "scanner.c"
 						SANE_Handle _tmp81_ = {0};
 						SANE_Option_Descriptor* _tmp82_ = NULL;
 						SANE_Int _tmp83_ = {0};
@@ -9240,16 +9250,16 @@ static void scanner_do_get_option (Scanner* self) {
 						if (!_tmp85_) {
 #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 9236 "scanner.c"
+#line 9246 "scanner.c"
 						}
 					}
 #line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9241 "scanner.c"
+#line 9251 "scanner.c"
 				}
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BOTH:
-#line 9245 "scanner.c"
+#line 9255 "scanner.c"
 				{
 					SANE_Handle _tmp86_ = {0};
 					SANE_Option_Descriptor* _tmp87_ = NULL;
@@ -9271,7 +9281,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp90_ = scanner_set_constrained_string_option (self, _tmp86_, _tmp87_, _tmp88_, _tmp89_, _tmp89__length1, NULL);
 #line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp90_) {
-#line 9267 "scanner.c"
+#line 9277 "scanner.c"
 						SANE_Handle _tmp91_ = {0};
 						SANE_Option_Descriptor* _tmp92_ = NULL;
 						SANE_Int _tmp93_ = {0};
@@ -9294,17 +9304,17 @@ static void scanner_do_get_option (Scanner* self) {
 						if (!_tmp95_) {
 #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 9290 "scanner.c"
+#line 9300 "scanner.c"
 						}
 					}
 #line 965 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9295 "scanner.c"
+#line 9305 "scanner.c"
 				}
 				default:
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 9300 "scanner.c"
+#line 9310 "scanner.c"
 			}
 #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);
@@ -9316,7 +9326,7 @@ static void scanner_do_get_option (Scanner* self) {
 			adf_sources = (_vala_array_free (adf_sources, adf_sources_length1, (GDestroyNotify) g_free), NULL);
 #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 9312 "scanner.c"
+#line 9322 "scanner.c"
 		}
 #line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp96_ = self->priv->handle;
@@ -9332,7 +9342,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp100_ = option;
 #line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp100_ != NULL) {
-#line 9328 "scanner.c"
+#line 9338 "scanner.c"
 			gchar** color_scan_modes = NULL;
 			const gchar* _tmp101_ = NULL;
 			gchar* _tmp102_ = NULL;
@@ -9536,7 +9546,7 @@ static void scanner_do_get_option (Scanner* self) {
 			switch (_tmp140_) {
 #line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_COLOR:
-#line 9532 "scanner.c"
+#line 9542 "scanner.c"
 				{
 					SANE_Handle _tmp141_ = {0};
 					SANE_Option_Descriptor* _tmp142_ = NULL;
@@ -9560,15 +9570,15 @@ static void scanner_do_get_option (Scanner* self) {
 					if (!_tmp145_) {
 #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 9556 "scanner.c"
+#line 9566 "scanner.c"
 					}
 #line 1015 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9560 "scanner.c"
+#line 9570 "scanner.c"
 				}
 #line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_GRAY:
-#line 9564 "scanner.c"
+#line 9574 "scanner.c"
 				{
 					SANE_Handle _tmp146_ = {0};
 					SANE_Option_Descriptor* _tmp147_ = NULL;
@@ -9592,15 +9602,15 @@ static void scanner_do_get_option (Scanner* self) {
 					if (!_tmp150_) {
 #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 9588 "scanner.c"
+#line 9598 "scanner.c"
 					}
 #line 1019 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9592 "scanner.c"
+#line 9602 "scanner.c"
 				}
 #line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_LINEART:
-#line 9596 "scanner.c"
+#line 9606 "scanner.c"
 				{
 					SANE_Handle _tmp151_ = {0};
 					SANE_Option_Descriptor* _tmp152_ = NULL;
@@ -9624,17 +9634,17 @@ static void scanner_do_get_option (Scanner* self) {
 					if (!_tmp155_) {
 #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 9620 "scanner.c"
+#line 9630 "scanner.c"
 					}
 #line 1023 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9624 "scanner.c"
+#line 9634 "scanner.c"
 				}
 				default:
 				{
 #line 1025 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9630 "scanner.c"
+#line 9640 "scanner.c"
 				}
 			}
 #line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9643,7 +9653,7 @@ static void scanner_do_get_option (Scanner* self) {
 			gray_scan_modes = (_vala_array_free (gray_scan_modes, gray_scan_modes_length1, (GDestroyNotify) g_free), NULL);
 #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 9639 "scanner.c"
+#line 9649 "scanner.c"
 		}
 #line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp156_ = self->priv->handle;
@@ -9657,7 +9667,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp159_ = option;
 #line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp159_ != NULL) {
-#line 9653 "scanner.c"
+#line 9663 "scanner.c"
 			SANE_Option_Descriptor* _tmp160_ = NULL;
 			SANE_Value_Type _tmp161_ = 0;
 #line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9666,7 +9676,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp161_ = _tmp160_->type;
 #line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp161_ == SANE_TYPE_BOOL) {
-#line 9662 "scanner.c"
+#line 9672 "scanner.c"
 				SANE_Handle _tmp162_ = {0};
 				SANE_Option_Descriptor* _tmp163_ = NULL;
 				SANE_Int _tmp164_ = {0};
@@ -9684,7 +9694,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp166_ = _tmp165_->type;
 #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 9680 "scanner.c"
+#line 9690 "scanner.c"
 			}
 		}
 #line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9699,7 +9709,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp170_ = option;
 #line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp170_ != NULL) {
-#line 9695 "scanner.c"
+#line 9705 "scanner.c"
 			SANE_Option_Descriptor* _tmp171_ = NULL;
 			SANE_Value_Type _tmp172_ = 0;
 #line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9708,7 +9718,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp172_ = _tmp171_->type;
 #line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp172_ == SANE_TYPE_BOOL) {
-#line 9704 "scanner.c"
+#line 9714 "scanner.c"
 				SANE_Handle _tmp173_ = {0};
 				SANE_Option_Descriptor* _tmp174_ = NULL;
 				SANE_Int _tmp175_ = {0};
@@ -9726,7 +9736,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp177_ = _tmp176_->type;
 #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 9722 "scanner.c"
+#line 9732 "scanner.c"
 			}
 		}
 #line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9741,7 +9751,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp181_ = option;
 #line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp181_ != NULL) {
-#line 9737 "scanner.c"
+#line 9747 "scanner.c"
 			gchar** disable_compression_names = NULL;
 			const gchar* _tmp182_ = NULL;
 			gchar* _tmp183_ = NULL;
@@ -9802,11 +9812,11 @@ static void scanner_do_get_option (Scanner* self) {
 			if (!_tmp193_) {
 #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 9798 "scanner.c"
+#line 9808 "scanner.c"
 			}
 #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 9802 "scanner.c"
+#line 9812 "scanner.c"
 		}
 #line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp194_ = self->priv->handle;
@@ -9822,7 +9832,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp198_ = option;
 #line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp198_ != NULL) {
-#line 9818 "scanner.c"
+#line 9828 "scanner.c"
 			SANE_Handle _tmp199_ = {0};
 			SANE_Option_Descriptor* _tmp200_ = NULL;
 			SANE_Int _tmp201_ = {0};
@@ -9865,7 +9875,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp210_ = option;
 #line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp210_ != NULL) {
-#line 9861 "scanner.c"
+#line 9871 "scanner.c"
 				ScanJob* _tmp211_ = NULL;
 				gint _tmp212_ = 0;
 #line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9874,7 +9884,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp212_ = _tmp211_->depth;
 #line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp212_ > 0) {
-#line 9870 "scanner.c"
+#line 9880 "scanner.c"
 					SANE_Handle _tmp213_ = {0};
 					SANE_Option_Descriptor* _tmp214_ = NULL;
 					SANE_Int _tmp215_ = {0};
@@ -9892,7 +9902,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp217_ = _tmp216_->depth;
 #line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_set_int_option (self, _tmp213_, _tmp214_, _tmp215_, _tmp217_, NULL);
-#line 9888 "scanner.c"
+#line 9898 "scanner.c"
 				}
 			}
 		}
@@ -9910,7 +9920,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp222_ = option;
 #line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp222_ != NULL) {
-#line 9906 "scanner.c"
+#line 9916 "scanner.c"
 			ScanJob* _tmp223_ = NULL;
 			gint _tmp224_ = 0;
 #line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9919,7 +9929,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp224_ = _tmp223_->page_width;
 #line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp224_ > 0) {
-#line 9915 "scanner.c"
+#line 9925 "scanner.c"
 				SANE_Handle _tmp225_ = {0};
 				SANE_Option_Descriptor* _tmp226_ = NULL;
 				SANE_Int _tmp227_ = {0};
@@ -9949,7 +9959,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp233_ = scanner_convert_page_size (self, _tmp228_, (gdouble) _tmp230_, _tmp232_);
 #line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_fixed_or_int_option (self, _tmp225_, _tmp226_, _tmp227_, _tmp233_, NULL);
-#line 9945 "scanner.c"
+#line 9955 "scanner.c"
 			} else {
 				SANE_Handle _tmp234_ = {0};
 				SANE_Option_Descriptor* _tmp235_ = NULL;
@@ -9962,7 +9972,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp236_ = index;
 #line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_option_to_max (self, _tmp234_, _tmp235_, _tmp236_);
-#line 9958 "scanner.c"
+#line 9968 "scanner.c"
 			}
 		}
 #line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9979,7 +9989,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp241_ = option;
 #line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp241_ != NULL) {
-#line 9975 "scanner.c"
+#line 9985 "scanner.c"
 			ScanJob* _tmp242_ = NULL;
 			gint _tmp243_ = 0;
 #line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9988,7 +9998,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp243_ = _tmp242_->page_height;
 #line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp243_ > 0) {
-#line 9984 "scanner.c"
+#line 9994 "scanner.c"
 				SANE_Handle _tmp244_ = {0};
 				SANE_Option_Descriptor* _tmp245_ = NULL;
 				SANE_Int _tmp246_ = {0};
@@ -10018,7 +10028,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp252_ = scanner_convert_page_size (self, _tmp247_, (gdouble) _tmp249_, _tmp251_);
 #line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_fixed_or_int_option (self, _tmp244_, _tmp245_, _tmp246_, _tmp252_, NULL);
-#line 10014 "scanner.c"
+#line 10024 "scanner.c"
 			} else {
 				SANE_Handle _tmp253_ = {0};
 				SANE_Option_Descriptor* _tmp254_ = NULL;
@@ -10031,7 +10041,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp255_ = index;
 #line 1089 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_option_to_max (self, _tmp253_, _tmp254_, _tmp255_);
-#line 10027 "scanner.c"
+#line 10037 "scanner.c"
 			}
 		}
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10048,7 +10058,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp261_ = option;
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp261_ != NULL) {
-#line 10044 "scanner.c"
+#line 10054 "scanner.c"
 			ScanJob* _tmp262_ = NULL;
 			gint _tmp263_ = 0;
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10057,15 +10067,15 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp263_ = _tmp262_->page_width;
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp260_ = ((gdouble) _tmp263_) > 0.0;
-#line 10053 "scanner.c"
+#line 10063 "scanner.c"
 		} else {
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp260_ = FALSE;
-#line 10057 "scanner.c"
+#line 10067 "scanner.c"
 		}
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp260_) {
-#line 10061 "scanner.c"
+#line 10071 "scanner.c"
 			SANE_Handle _tmp264_ = {0};
 			SANE_Option_Descriptor* _tmp265_ = NULL;
 			SANE_Int _tmp266_ = {0};
@@ -10095,7 +10105,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp272_ = scanner_convert_page_size (self, _tmp267_, (gdouble) _tmp269_, _tmp271_);
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_set_fixed_or_int_option (self, _tmp264_, _tmp265_, _tmp266_, _tmp272_, NULL);
-#line 10091 "scanner.c"
+#line 10101 "scanner.c"
 		}
 #line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp273_ = self->priv->handle;
@@ -10111,7 +10121,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp278_ = option;
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp278_ != NULL) {
-#line 10107 "scanner.c"
+#line 10117 "scanner.c"
 			ScanJob* _tmp279_ = NULL;
 			gint _tmp280_ = 0;
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10120,15 +10130,15 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp280_ = _tmp279_->page_height;
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp277_ = ((gdouble) _tmp280_) > 0.0;
-#line 10116 "scanner.c"
+#line 10126 "scanner.c"
 		} else {
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp277_ = FALSE;
-#line 10120 "scanner.c"
+#line 10130 "scanner.c"
 		}
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp277_) {
-#line 10124 "scanner.c"
+#line 10134 "scanner.c"
 			SANE_Handle _tmp281_ = {0};
 			SANE_Option_Descriptor* _tmp282_ = NULL;
 			SANE_Int _tmp283_ = {0};
@@ -10158,7 +10168,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp289_ = scanner_convert_page_size (self, _tmp284_, (gdouble) _tmp286_, _tmp288_);
 #line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_set_fixed_or_int_option (self, _tmp281_, _tmp282_, _tmp283_, _tmp289_, NULL);
-#line 10154 "scanner.c"
+#line 10164 "scanner.c"
 		}
 #line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp290_ = self->priv->handle;
@@ -10174,7 +10184,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp294_ = option;
 #line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp294_ != NULL) {
-#line 10170 "scanner.c"
+#line 10180 "scanner.c"
 			ScanJob* _tmp295_ = NULL;
 			gint _tmp296_ = 0;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10183,7 +10193,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp296_ = _tmp295_->brightness;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp296_ != 0) {
-#line 10179 "scanner.c"
+#line 10189 "scanner.c"
 				gint brightness = 0;
 				SANE_Option_Descriptor* _tmp297_ = NULL;
 				ScanJob* _tmp298_ = NULL;
@@ -10213,7 +10223,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp304_ = brightness;
 #line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp301_, _tmp302_, _tmp303_, _tmp304_, NULL);
-#line 10209 "scanner.c"
+#line 10219 "scanner.c"
 			}
 		}
 #line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10230,7 +10240,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp309_ = option;
 #line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp309_ != NULL) {
-#line 10226 "scanner.c"
+#line 10236 "scanner.c"
 			ScanJob* _tmp310_ = NULL;
 			gint _tmp311_ = 0;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10239,7 +10249,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp311_ = _tmp310_->contrast;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp311_ != 0) {
-#line 10235 "scanner.c"
+#line 10245 "scanner.c"
 				gint contrast = 0;
 				SANE_Option_Descriptor* _tmp312_ = NULL;
 				ScanJob* _tmp313_ = NULL;
@@ -10269,14 +10279,14 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp319_ = contrast;
 #line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp316_, _tmp317_, _tmp318_, _tmp319_, NULL);
-#line 10265 "scanner.c"
+#line 10275 "scanner.c"
 			}
 		}
 #line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp320_ = self->priv->current_device;
 #line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (g_strcmp0 (_tmp320_, "test") == 0) {
-#line 10272 "scanner.c"
+#line 10282 "scanner.c"
 			SANE_Handle _tmp321_ = {0};
 			gint _tmp322_ = 0;
 			SANE_Option_Descriptor* _tmp323_ = NULL;
@@ -10309,7 +10319,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp324_ = option;
 #line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp324_ != NULL) {
-#line 10305 "scanner.c"
+#line 10315 "scanner.c"
 				SANE_Handle _tmp325_ = {0};
 				SANE_Option_Descriptor* _tmp326_ = NULL;
 				SANE_Int _tmp327_ = {0};
@@ -10321,7 +10331,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp327_ = index;
 #line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp325_, _tmp326_, _tmp327_, FALSE, NULL);
-#line 10317 "scanner.c"
+#line 10327 "scanner.c"
 			}
 #line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp328_ = self->priv->handle;
@@ -10335,7 +10345,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp331_ = option;
 #line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp331_ != NULL) {
-#line 10331 "scanner.c"
+#line 10341 "scanner.c"
 				SANE_Handle _tmp332_ = {0};
 				SANE_Option_Descriptor* _tmp333_ = NULL;
 				SANE_Int _tmp334_ = {0};
@@ -10347,7 +10357,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp334_ = index;
 #line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp332_, _tmp333_, _tmp334_, FALSE, NULL);
-#line 10343 "scanner.c"
+#line 10353 "scanner.c"
 			}
 #line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp335_ = self->priv->handle;
@@ -10361,7 +10371,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp338_ = option;
 #line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp338_ != NULL) {
-#line 10357 "scanner.c"
+#line 10367 "scanner.c"
 				SANE_Handle _tmp339_ = {0};
 				SANE_Option_Descriptor* _tmp340_ = NULL;
 				SANE_Int _tmp341_ = {0};
@@ -10373,7 +10383,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp341_ = index;
 #line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_string_option (self, _tmp339_, _tmp340_, _tmp341_, "Color pattern", NULL);
-#line 10369 "scanner.c"
+#line 10379 "scanner.c"
 			}
 #line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp342_ = self->priv->handle;
@@ -10387,7 +10397,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp345_ = option;
 #line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp345_ != NULL) {
-#line 10383 "scanner.c"
+#line 10393 "scanner.c"
 				SANE_Handle _tmp346_ = {0};
 				SANE_Option_Descriptor* _tmp347_ = NULL;
 				SANE_Int _tmp348_ = {0};
@@ -10399,7 +10409,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp348_ = index;
 #line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp346_, _tmp347_, _tmp348_, TRUE, NULL);
-#line 10395 "scanner.c"
+#line 10405 "scanner.c"
 			}
 #line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp349_ = self->priv->handle;
@@ -10413,7 +10423,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp352_ = option;
 #line 1135 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp352_ != NULL) {
-#line 10409 "scanner.c"
+#line 10419 "scanner.c"
 				SANE_Handle _tmp353_ = {0};
 				SANE_Option_Descriptor* _tmp354_ = NULL;
 				SANE_Int _tmp355_ = {0};
@@ -10425,7 +10435,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp355_ = index;
 #line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp353_, _tmp354_, _tmp355_, 200000, NULL);
-#line 10421 "scanner.c"
+#line 10431 "scanner.c"
 			}
 		}
 #line 1139 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10434,7 +10444,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10430 "scanner.c"
+#line 10440 "scanner.c"
 	}
 #line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp356_ = index;
@@ -10452,7 +10462,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10448 "scanner.c"
+#line 10458 "scanner.c"
 	}
 #line 1150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp360_ = option;
@@ -10464,7 +10474,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10460 "scanner.c"
+#line 10470 "scanner.c"
 	}
 #line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp362_ = option;
@@ -10476,7 +10486,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10472 "scanner.c"
+#line 10482 "scanner.c"
 	}
 #line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp364_ = self->priv->options;
@@ -10492,7 +10502,7 @@ static void scanner_do_get_option (Scanner* self) {
 	g_hash_table_insert (_tmp364_, _tmp367_, (gpointer) ((gintptr) ((gint) _tmp368_)));
 #line 879 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 10488 "scanner.c"
+#line 10498 "scanner.c"
 }
 
 
@@ -10510,7 +10520,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 	_tmp1_ = _tmp0_->unit;
 #line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SANE_UNIT_PIXEL) {
-#line 10506 "scanner.c"
+#line 10516 "scanner.c"
 		gdouble _tmp2_ = 0.0;
 		gdouble _tmp3_ = 0.0;
 #line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10521,7 +10531,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 		result = (_tmp2_ * _tmp3_) / 254.0;
 #line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 10517 "scanner.c"
+#line 10527 "scanner.c"
 	} else {
 		SANE_Option_Descriptor* _tmp4_ = NULL;
 		SANE_Unit _tmp5_ = 0;
@@ -10531,7 +10541,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 		_tmp5_ = _tmp4_->unit;
 #line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp5_ == SANE_UNIT_MM) {
-#line 10527 "scanner.c"
+#line 10537 "scanner.c"
 			gdouble _tmp6_ = 0.0;
 #line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = size;
@@ -10539,7 +10549,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 			result = _tmp6_ / 10.0;
 #line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 10535 "scanner.c"
+#line 10545 "scanner.c"
 		} else {
 #line 1168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:1168: Unable to set unsupported unit type");
@@ -10547,7 +10557,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 			result = (gdouble) 0.0f;
 #line 1169 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 10543 "scanner.c"
+#line 10553 "scanner.c"
 		}
 	}
 }
@@ -10585,11 +10595,11 @@ static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_H
 		if (index) {
 #line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			*index = _vala_index;
-#line 10581 "scanner.c"
+#line 10591 "scanner.c"
 		}
 #line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 10585 "scanner.c"
+#line 10595 "scanner.c"
 	}
 #line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = handle;
@@ -10603,11 +10613,11 @@ static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_H
 	if (index) {
 #line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*index = _vala_index;
-#line 10599 "scanner.c"
+#line 10609 "scanner.c"
 	}
 #line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 10603 "scanner.c"
+#line 10613 "scanner.c"
 }
 
 
@@ -10639,7 +10649,7 @@ static void scanner_do_complete_document (Scanner* self) {
 		self->priv->state = SCAN_STATE_OPEN;
 #line 1195 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10635 "scanner.c"
+#line 10645 "scanner.c"
 	}
 #line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = notify_document_done_new ();
@@ -10651,7 +10661,7 @@ static void scanner_do_complete_document (Scanner* self) {
 	_notify_unref0 (_tmp4_);
 #line 1202 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
-#line 10647 "scanner.c"
+#line 10657 "scanner.c"
 }
 
 
@@ -10703,7 +10713,7 @@ static void scanner_do_start (Scanner* self) {
 	if (_tmp9_ == SANE_STATUS_GOOD) {
 #line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_GET_PARAMETERS;
-#line 10699 "scanner.c"
+#line 10709 "scanner.c"
 	} else {
 		SANE_Status _tmp10_ = 0;
 #line 1215 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10712,7 +10722,7 @@ static void scanner_do_start (Scanner* self) {
 		if (_tmp10_ == SANE_STATUS_NO_DOCS) {
 #line 1216 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_do_complete_document (self);
-#line 10708 "scanner.c"
+#line 10718 "scanner.c"
 		} else {
 			SANE_Status _tmp11_ = 0;
 			const gchar* _tmp12_ = NULL;
@@ -10730,7 +10740,7 @@ static void scanner_do_start (Scanner* self) {
 			_tmp14_ = _ ("Unable to start scan");
 #line 1220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_fail_scan (self, (gint) _tmp13_, _tmp14_);
-#line 10726 "scanner.c"
+#line 10736 "scanner.c"
 		}
 	}
 }
@@ -10745,7 +10755,7 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 	switch (_tmp0_) {
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GRAY:
-#line 10741 "scanner.c"
+#line 10751 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10754,11 +10764,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp1_;
 #line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10750 "scanner.c"
+#line 10760 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RGB:
-#line 10754 "scanner.c"
+#line 10764 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10767,11 +10777,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp2_;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10763 "scanner.c"
+#line 10773 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RED:
-#line 10767 "scanner.c"
+#line 10777 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10780,11 +10790,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp3_;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10776 "scanner.c"
+#line 10786 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GREEN:
-#line 10780 "scanner.c"
+#line 10790 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10793,11 +10803,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp4_;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10789 "scanner.c"
+#line 10799 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_BLUE:
-#line 10793 "scanner.c"
+#line 10803 "scanner.c"
 		{
 			gchar* _tmp5_ = NULL;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10806,7 +10816,7 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp5_;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10802 "scanner.c"
+#line 10812 "scanner.c"
 		}
 		default:
 		{
@@ -10820,7 +10830,7 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp7_;
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10816 "scanner.c"
+#line 10826 "scanner.c"
 		}
 	}
 }
@@ -10911,7 +10921,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 	_tmp6_ = status;
 #line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != SANE_STATUS_GOOD) {
-#line 10907 "scanner.c"
+#line 10917 "scanner.c"
 		SANE_Status _tmp7_ = 0;
 		const gchar* _tmp8_ = NULL;
 		SANE_Status _tmp9_ = 0;
@@ -10930,7 +10940,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 		scanner_fail_scan (self, (gint) _tmp9_, _tmp10_);
 #line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10926 "scanner.c"
+#line 10936 "scanner.c"
 	}
 #line 1239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = self->priv->job_queue;
@@ -10948,11 +10958,11 @@ static void scanner_do_get_parameters (Scanner* self) {
 	if (_tmp16_) {
 #line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_TRUE";
-#line 10944 "scanner.c"
+#line 10954 "scanner.c"
 	} else {
 #line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_FALSE";
-#line 10948 "scanner.c"
+#line 10958 "scanner.c"
 	}
 #line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = self->priv->parameters;
@@ -11017,7 +11027,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 	_tmp43_ = _tmp42_.depth;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp43_ == 8) {
-#line 11012 "scanner.c"
+#line 11022 "scanner.c"
 		SANE_Parameters _tmp44_ = {0};
 		SANE_Frame _tmp45_ = 0;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11026,15 +11036,15 @@ static void scanner_do_get_parameters (Scanner* self) {
 		_tmp45_ = _tmp44_.format;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = _tmp45_ == SANE_FRAME_GRAY;
-#line 11021 "scanner.c"
+#line 11031 "scanner.c"
 	} else {
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = FALSE;
-#line 11025 "scanner.c"
+#line 11035 "scanner.c"
 	}
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp41_) {
-#line 11029 "scanner.c"
+#line 11039 "scanner.c"
 		ScanJob* _tmp46_ = NULL;
 		gint _tmp47_ = 0;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11043,15 +11053,15 @@ static void scanner_do_get_parameters (Scanner* self) {
 		_tmp47_ = _tmp46_->depth;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = _tmp47_ == 2;
-#line 11038 "scanner.c"
+#line 11048 "scanner.c"
 	} else {
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = FALSE;
-#line 11042 "scanner.c"
+#line 11052 "scanner.c"
 	}
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp40_) {
-#line 11046 "scanner.c"
+#line 11056 "scanner.c"
 		ScanJob* _tmp48_ = NULL;
 		ScanMode _tmp49_ = 0;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11060,15 +11070,15 @@ static void scanner_do_get_parameters (Scanner* self) {
 		_tmp49_ = _tmp48_->scan_mode;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp39_ = _tmp49_ == SCAN_MODE_GRAY;
-#line 11055 "scanner.c"
+#line 11065 "scanner.c"
 	} else {
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp39_ = FALSE;
-#line 11059 "scanner.c"
+#line 11069 "scanner.c"
 	}
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp39_) {
-#line 11063 "scanner.c"
+#line 11073 "scanner.c"
 		ScanPageInfo* _tmp50_ = NULL;
 		ScanJob* _tmp51_ = NULL;
 		gint _tmp52_ = 0;
@@ -11080,7 +11090,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 		_tmp52_ = _tmp51_->depth;
 #line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp50_->depth = _tmp52_;
-#line 11075 "scanner.c"
+#line 11085 "scanner.c"
 	}
 #line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp54_ = self->priv->parameters;
@@ -11090,11 +11100,11 @@ static void scanner_do_get_parameters (Scanner* self) {
 	if (_tmp55_ == SANE_FRAME_GRAY) {
 #line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = 1;
-#line 11085 "scanner.c"
+#line 11095 "scanner.c"
 	} else {
 #line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = 3;
-#line 11089 "scanner.c"
+#line 11099 "scanner.c"
 	}
 #line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp56_ = info;
@@ -11124,7 +11134,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 	_tmp64_ = self->priv->notified_page;
 #line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp63_ != _tmp64_) {
-#line 11119 "scanner.c"
+#line 11129 "scanner.c"
 		ScanJob* _tmp65_ = NULL;
 		gint _tmp66_ = 0;
 		ScanPageInfo* _tmp67_ = NULL;
@@ -11149,7 +11159,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 		_tmp70_ = self->priv->page_number;
 #line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->notified_page = _tmp70_;
-#line 11144 "scanner.c"
+#line 11154 "scanner.c"
 	}
 #line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp71_ = self->priv->parameters;
@@ -11181,7 +11191,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 	_scan_page_info_unref0 (info);
 #line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 11176 "scanner.c"
+#line 11186 "scanner.c"
 }
 
 
@@ -11226,7 +11236,7 @@ static void scanner_do_complete_page (Scanner* self) {
 	_tmp8_ = _tmp7_.last_frame;
 #line 1283 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!_tmp8_) {
-#line 11221 "scanner.c"
+#line 11231 "scanner.c"
 		gint _tmp9_ = 0;
 #line 1285 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->pass_number;
@@ -11238,7 +11248,7 @@ static void scanner_do_complete_page (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11233 "scanner.c"
+#line 11243 "scanner.c"
 	}
 #line 1291 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = job;
@@ -11246,7 +11256,7 @@ static void scanner_do_complete_page (Scanner* self) {
 	_tmp11_ = _tmp10_->type;
 #line 1291 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp11_ != SCAN_TYPE_SINGLE) {
-#line 11241 "scanner.c"
+#line 11251 "scanner.c"
 		gint _tmp12_ = 0;
 		ScanJob* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
@@ -11276,13 +11286,13 @@ static void scanner_do_complete_page (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11271 "scanner.c"
+#line 11281 "scanner.c"
 	}
 #line 1300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_do_complete_document (self);
 #line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 11277 "scanner.c"
+#line 11287 "scanner.c"
 }
 
 
@@ -11377,7 +11387,7 @@ static void scanner_do_read (Scanner* self) {
 	_tmp17_ = status;
 #line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp17_ == SANE_STATUS_EOF) {
-#line 11372 "scanner.c"
+#line 11382 "scanner.c"
 		gboolean _tmp18_ = FALSE;
 		SANE_Parameters _tmp19_ = {0};
 		gint _tmp20_ = 0;
@@ -11388,7 +11398,7 @@ static void scanner_do_read (Scanner* self) {
 		_tmp20_ = _tmp19_.lines;
 #line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ > 0) {
-#line 11383 "scanner.c"
+#line 11393 "scanner.c"
 			gint _tmp21_ = 0;
 			SANE_Parameters _tmp22_ = {0};
 			gint _tmp23_ = 0;
@@ -11400,15 +11410,15 @@ static void scanner_do_read (Scanner* self) {
 			_tmp23_ = _tmp22_.lines;
 #line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = _tmp21_ != _tmp23_;
-#line 11395 "scanner.c"
+#line 11405 "scanner.c"
 		} else {
 #line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = FALSE;
-#line 11399 "scanner.c"
+#line 11409 "scanner.c"
 		}
 #line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp18_) {
-#line 11403 "scanner.c"
+#line 11413 "scanner.c"
 			gint _tmp24_ = 0;
 			SANE_Parameters _tmp25_ = {0};
 			gint _tmp26_ = 0;
@@ -11420,19 +11430,19 @@ static void scanner_do_read (Scanner* self) {
 			_tmp26_ = _tmp25_.lines;
 #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 11415 "scanner.c"
+#line 11425 "scanner.c"
 		}
 #line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp27_ = self->priv->n_used;
 #line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp27_ > 0) {
-#line 11421 "scanner.c"
+#line 11431 "scanner.c"
 			gint _tmp28_ = 0;
 #line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = self->priv->n_used;
 #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 11427 "scanner.c"
+#line 11437 "scanner.c"
 		}
 #line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_do_complete_page (self);
@@ -11440,13 +11450,13 @@ static void scanner_do_read (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1323 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11435 "scanner.c"
+#line 11445 "scanner.c"
 	}
 #line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = status;
 #line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp29_ != SANE_STATUS_GOOD) {
-#line 11441 "scanner.c"
+#line 11451 "scanner.c"
 		SANE_Status _tmp30_ = 0;
 		const gchar* _tmp31_ = NULL;
 		SANE_Status _tmp32_ = 0;
@@ -11467,7 +11477,7 @@ static void scanner_do_read (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11462 "scanner.c"
+#line 11472 "scanner.c"
 	}
 #line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	full_read = FALSE;
@@ -11475,7 +11485,7 @@ static void scanner_do_read (Scanner* self) {
 	_tmp35_ = self->priv->n_used;
 #line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp35_ == 0) {
-#line 11470 "scanner.c"
+#line 11480 "scanner.c"
 		SANE_Int _tmp36_ = {0};
 		guchar* _tmp37_ = NULL;
 		gint _tmp37__length1 = 0;
@@ -11487,17 +11497,17 @@ static void scanner_do_read (Scanner* self) {
 		_tmp37__length1 = self->priv->buffer_length1;
 #line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = _tmp36_ == ((SANE_Int) _tmp37__length1);
-#line 11482 "scanner.c"
+#line 11492 "scanner.c"
 	} else {
 #line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = FALSE;
-#line 11486 "scanner.c"
+#line 11496 "scanner.c"
 	}
 #line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp34_) {
 #line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		full_read = TRUE;
-#line 11492 "scanner.c"
+#line 11502 "scanner.c"
 	}
 #line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = self->priv->n_used;
@@ -11513,7 +11523,7 @@ static void scanner_do_read (Scanner* self) {
 	_tmp42_ = _tmp41_.bytes_per_line;
 #line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp40_ >= _tmp42_) {
-#line 11508 "scanner.c"
+#line 11518 "scanner.c"
 		ScanLine* line = NULL;
 		ScanLine* _tmp43_ = NULL;
 		SANE_Parameters _tmp44_ = {0};
@@ -11574,7 +11584,7 @@ static void scanner_do_read (Scanner* self) {
 		switch (_tmp45_) {
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GRAY:
-#line 11569 "scanner.c"
+#line 11579 "scanner.c"
 			{
 				ScanLine* _tmp46_ = NULL;
 #line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11583,11 +11593,11 @@ static void scanner_do_read (Scanner* self) {
 				_tmp46_->channel = 0;
 #line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11578 "scanner.c"
+#line 11588 "scanner.c"
 			}
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RGB:
-#line 11582 "scanner.c"
+#line 11592 "scanner.c"
 			{
 				ScanLine* _tmp47_ = NULL;
 #line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11596,11 +11606,11 @@ static void scanner_do_read (Scanner* self) {
 				_tmp47_->channel = -1;
 #line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11591 "scanner.c"
+#line 11601 "scanner.c"
 			}
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RED:
-#line 11595 "scanner.c"
+#line 11605 "scanner.c"
 			{
 				ScanLine* _tmp48_ = NULL;
 #line 1354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11609,11 +11619,11 @@ static void scanner_do_read (Scanner* self) {
 				_tmp48_->channel = 0;
 #line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11604 "scanner.c"
+#line 11614 "scanner.c"
 			}
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GREEN:
-#line 11608 "scanner.c"
+#line 11618 "scanner.c"
 			{
 				ScanLine* _tmp49_ = NULL;
 #line 1357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11622,11 +11632,11 @@ static void scanner_do_read (Scanner* self) {
 				_tmp49_->channel = 1;
 #line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11617 "scanner.c"
+#line 11627 "scanner.c"
 			}
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_BLUE:
-#line 11621 "scanner.c"
+#line 11631 "scanner.c"
 			{
 				ScanLine* _tmp50_ = NULL;
 #line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11635,12 +11645,12 @@ static void scanner_do_read (Scanner* self) {
 				_tmp50_->channel = 2;
 #line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11630 "scanner.c"
+#line 11640 "scanner.c"
 			}
 			default:
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 11635 "scanner.c"
+#line 11645 "scanner.c"
 		}
 #line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp51_ = line;
@@ -11718,7 +11728,7 @@ static void scanner_do_read (Scanner* self) {
 		_tmp73_ = full_read;
 #line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp73_) {
-#line 11713 "scanner.c"
+#line 11723 "scanner.c"
 			gint _tmp74_ = 0;
 			SANE_Parameters _tmp75_ = {0};
 			gint _tmp76_ = 0;
@@ -11730,7 +11740,7 @@ static void scanner_do_read (Scanner* self) {
 			_tmp76_ = _tmp75_.bytes_per_line;
 #line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			buffer_size = _tmp74_ + _tmp76_;
-#line 11725 "scanner.c"
+#line 11735 "scanner.c"
 		}
 #line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp77_ = buffer_size;
@@ -11758,19 +11768,19 @@ static void scanner_do_read (Scanner* self) {
 		n_remaining = _tmp79_ - (_tmp81_ * _tmp83_);
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->n_used = 0;
-#line 11753 "scanner.c"
+#line 11763 "scanner.c"
 		{
 			gint i = 0;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			i = 0;
-#line 11758 "scanner.c"
+#line 11768 "scanner.c"
 			{
 				gboolean _tmp84_ = FALSE;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp84_ = TRUE;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				while (TRUE) {
-#line 11765 "scanner.c"
+#line 11775 "scanner.c"
 					gint _tmp86_ = 0;
 					gint _tmp87_ = 0;
 					guchar* _tmp88_ = NULL;
@@ -11789,13 +11799,13 @@ static void scanner_do_read (Scanner* self) {
 					gint _tmp99_ = 0;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp84_) {
-#line 11784 "scanner.c"
+#line 11794 "scanner.c"
 						gint _tmp85_ = 0;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp85_ = i;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						i = _tmp85_ + 1;
-#line 11790 "scanner.c"
+#line 11800 "scanner.c"
 					}
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp84_ = FALSE;
@@ -11807,7 +11817,7 @@ static void scanner_do_read (Scanner* self) {
 					if (!(_tmp86_ < _tmp87_)) {
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						break;
-#line 11802 "scanner.c"
+#line 11812 "scanner.c"
 					}
 #line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88_ = self->priv->buffer;
@@ -11841,7 +11851,7 @@ static void scanner_do_read (Scanner* self) {
 					_tmp99_ = self->priv->n_used;
 #line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->n_used = _tmp99_ + 1;
-#line 11836 "scanner.c"
+#line 11846 "scanner.c"
 				}
 			}
 		}
@@ -11851,7 +11861,7 @@ static void scanner_do_read (Scanner* self) {
 		_tmp104_ = _tmp103_.depth;
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp104_ == 8) {
-#line 11846 "scanner.c"
+#line 11856 "scanner.c"
 			SANE_Parameters _tmp105_ = {0};
 			SANE_Frame _tmp106_ = 0;
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11860,15 +11870,15 @@ static void scanner_do_read (Scanner* self) {
 			_tmp106_ = _tmp105_.format;
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = _tmp106_ == SANE_FRAME_GRAY;
-#line 11855 "scanner.c"
+#line 11865 "scanner.c"
 		} else {
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = FALSE;
-#line 11859 "scanner.c"
+#line 11869 "scanner.c"
 		}
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp102_) {
-#line 11863 "scanner.c"
+#line 11873 "scanner.c"
 			ScanJob* _tmp107_ = NULL;
 			gint _tmp108_ = 0;
 #line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11877,15 +11887,15 @@ static void scanner_do_read (Scanner* self) {
 			_tmp108_ = _tmp107_->depth;
 #line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp101_ = _tmp108_ == 2;
-#line 11872 "scanner.c"
+#line 11882 "scanner.c"
 		} else {
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp101_ = FALSE;
-#line 11876 "scanner.c"
+#line 11886 "scanner.c"
 		}
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp101_) {
-#line 11880 "scanner.c"
+#line 11890 "scanner.c"
 			ScanJob* _tmp109_ = NULL;
 			ScanMode _tmp110_ = 0;
 #line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11894,15 +11904,15 @@ static void scanner_do_read (Scanner* self) {
 			_tmp110_ = _tmp109_->scan_mode;
 #line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp100_ = _tmp110_ == SCAN_MODE_GRAY;
-#line 11889 "scanner.c"
+#line 11899 "scanner.c"
 		} else {
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp100_ = FALSE;
-#line 11893 "scanner.c"
+#line 11903 "scanner.c"
 		}
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp100_) {
-#line 11897 "scanner.c"
+#line 11907 "scanner.c"
 			guchar block = '\0';
 			gint write_offset = 0;
 			gint block_shift = 0;
@@ -11915,19 +11925,19 @@ static void scanner_do_read (Scanner* self) {
 			write_offset = 0;
 #line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			block_shift = 6;
-#line 11910 "scanner.c"
+#line 11920 "scanner.c"
 			{
 				gint i = 0;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 11915 "scanner.c"
+#line 11925 "scanner.c"
 				{
 					gboolean _tmp111_ = FALSE;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp111_ = TRUE;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 11922 "scanner.c"
+#line 11932 "scanner.c"
 						gint _tmp113_ = 0;
 						ScanLine* _tmp114_ = NULL;
 						gint _tmp115_ = 0;
@@ -11938,13 +11948,13 @@ static void scanner_do_read (Scanner* self) {
 						gint _tmp143_ = 0;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp111_) {
-#line 11933 "scanner.c"
+#line 11943 "scanner.c"
 							gint _tmp112_ = 0;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp112_ = i;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp112_ + 1;
-#line 11939 "scanner.c"
+#line 11949 "scanner.c"
 						}
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp111_ = FALSE;
@@ -11958,7 +11968,7 @@ static void scanner_do_read (Scanner* self) {
 						if (!(_tmp113_ < _tmp115_)) {
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 11953 "scanner.c"
+#line 11963 "scanner.c"
 						}
 #line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp116_ = i;
@@ -11968,19 +11978,19 @@ static void scanner_do_read (Scanner* self) {
 						_tmp118_ = _tmp117_->data_length;
 #line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						offset = _tmp116_ * _tmp118_;
-#line 11963 "scanner.c"
+#line 11973 "scanner.c"
 						{
 							gint x = 0;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							x = 0;
-#line 11968 "scanner.c"
+#line 11978 "scanner.c"
 							{
 								gboolean _tmp119_ = FALSE;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								_tmp119_ = TRUE;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								while (TRUE) {
-#line 11975 "scanner.c"
+#line 11985 "scanner.c"
 									gint _tmp121_ = 0;
 									ScanLine* _tmp122_ = NULL;
 									gint _tmp123_ = 0;
@@ -11999,13 +12009,13 @@ static void scanner_do_read (Scanner* self) {
 									gint _tmp135_ = 0;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (!_tmp119_) {
-#line 11994 "scanner.c"
+#line 12004 "scanner.c"
 										gint _tmp120_ = 0;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp120_ = x;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										x = _tmp120_ + 1;
-#line 12000 "scanner.c"
+#line 12010 "scanner.c"
 									}
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp119_ = FALSE;
@@ -12019,7 +12029,7 @@ static void scanner_do_read (Scanner* self) {
 									if (!(_tmp121_ < _tmp123_)) {
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										break;
-#line 12014 "scanner.c"
+#line 12024 "scanner.c"
 									}
 #line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp124_ = line;
@@ -12041,7 +12051,7 @@ static void scanner_do_read (Scanner* self) {
 									if (((gint) _tmp129_) >= 192) {
 #line 1403 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										sample = (guchar) 3;
-#line 12036 "scanner.c"
+#line 12046 "scanner.c"
 									} else {
 										guchar _tmp130_ = '\0';
 #line 1404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12050,7 +12060,7 @@ static void scanner_do_read (Scanner* self) {
 										if (((gint) _tmp130_) >= 128) {
 #line 1405 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											sample = (guchar) 2;
-#line 12045 "scanner.c"
+#line 12055 "scanner.c"
 										} else {
 											guchar _tmp131_ = '\0';
 #line 1406 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12059,11 +12069,11 @@ static void scanner_do_read (Scanner* self) {
 											if (((gint) _tmp131_) >= 64) {
 #line 1407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 1;
-#line 12054 "scanner.c"
+#line 12064 "scanner.c"
 											} else {
 #line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 0;
-#line 12058 "scanner.c"
+#line 12068 "scanner.c"
 											}
 										}
 									}
@@ -12079,7 +12089,7 @@ static void scanner_do_read (Scanner* self) {
 									_tmp135_ = block_shift;
 #line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (_tmp135_ == 0) {
-#line 12074 "scanner.c"
+#line 12084 "scanner.c"
 										ScanLine* _tmp136_ = NULL;
 										guchar* _tmp137_ = NULL;
 										gint _tmp137__length1 = 0;
@@ -12109,14 +12119,14 @@ static void scanner_do_read (Scanner* self) {
 										block = (guchar) 0;
 #line 1417 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = 6;
-#line 12104 "scanner.c"
+#line 12114 "scanner.c"
 									} else {
 										gint _tmp142_ = 0;
 #line 1420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp142_ = block_shift;
 #line 1420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = _tmp142_ - 2;
-#line 12111 "scanner.c"
+#line 12121 "scanner.c"
 									}
 								}
 							}
@@ -12125,7 +12135,7 @@ static void scanner_do_read (Scanner* self) {
 						_tmp143_ = block_shift;
 #line 1424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp143_ != 6) {
-#line 12120 "scanner.c"
+#line 12130 "scanner.c"
 							ScanLine* _tmp144_ = NULL;
 							guchar* _tmp145_ = NULL;
 							gint _tmp145__length1 = 0;
@@ -12155,7 +12165,7 @@ static void scanner_do_read (Scanner* self) {
 							block = (guchar) 0;
 #line 1429 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							block_shift = 6;
-#line 12150 "scanner.c"
+#line 12160 "scanner.c"
 						}
 					}
 				}
@@ -12168,7 +12178,7 @@ static void scanner_do_read (Scanner* self) {
 			_tmp152_ = _tmp151_->width;
 #line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp150_->data_length = ((_tmp152_ * 2) + 7) / 8;
-#line 12163 "scanner.c"
+#line 12173 "scanner.c"
 		}
 #line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp153_ = job;
@@ -12186,18 +12196,18 @@ static void scanner_do_read (Scanner* self) {
 		_notify_unref0 (_tmp157_);
 #line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_line_unref0 (line);
-#line 12181 "scanner.c"
+#line 12191 "scanner.c"
 	}
 #line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 12185 "scanner.c"
+#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/trunk/src/scanner.vala"
 	scanner_authorization_cb (resource, username, -1, password, -1);
-#line 12192 "scanner.c"
+#line 12202 "scanner.c"
 }
 
 
@@ -12241,7 +12251,7 @@ static void* scanner_scan_thread (Scanner* self) {
 	_tmp5_ = status;
 #line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
-#line 12236 "scanner.c"
+#line 12246 "scanner.c"
 		SANE_Status _tmp6_ = 0;
 		const gchar* _tmp7_ = NULL;
 #line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12254,7 +12264,7 @@ static void* scanner_scan_thread (Scanner* self) {
 		result = NULL;
 #line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 12249 "scanner.c"
+#line 12259 "scanner.c"
 	}
 #line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = version_code;
@@ -12274,7 +12284,7 @@ static void* scanner_scan_thread (Scanner* self) {
 	scanner_redetect (self);
 #line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
-#line 12269 "scanner.c"
+#line 12279 "scanner.c"
 		gboolean _tmp14_ = FALSE;
 		ScanState _tmp15_ = 0;
 #line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12283,7 +12293,7 @@ static void* scanner_scan_thread (Scanner* self) {
 		if (!_tmp14_) {
 #line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 12278 "scanner.c"
+#line 12288 "scanner.c"
 		}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = self->priv->state;
@@ -12291,7 +12301,7 @@ static void* scanner_scan_thread (Scanner* self) {
 		switch (_tmp15_) {
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_IDLE:
-#line 12286 "scanner.c"
+#line 12296 "scanner.c"
 			{
 				GList* _tmp16_ = NULL;
 #line 1465 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12302,83 +12312,83 @@ static void* scanner_scan_thread (Scanner* self) {
 					scanner_set_scanning (self, TRUE);
 #line 1468 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->state = SCAN_STATE_OPEN;
-#line 12297 "scanner.c"
+#line 12307 "scanner.c"
 				}
 #line 1470 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12301 "scanner.c"
+#line 12311 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_REDETECT:
-#line 12305 "scanner.c"
+#line 12315 "scanner.c"
 			{
 #line 1472 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_redetect (self);
 #line 1473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12311 "scanner.c"
+#line 12321 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_OPEN:
-#line 12315 "scanner.c"
+#line 12325 "scanner.c"
 			{
 #line 1475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_open (self);
 #line 1476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12321 "scanner.c"
+#line 12331 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_OPTION:
-#line 12325 "scanner.c"
+#line 12335 "scanner.c"
 			{
 #line 1478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_option (self);
 #line 1479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12331 "scanner.c"
+#line 12341 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_START:
-#line 12335 "scanner.c"
+#line 12345 "scanner.c"
 			{
 #line 1481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_start (self);
 #line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12341 "scanner.c"
+#line 12351 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_PARAMETERS:
-#line 12345 "scanner.c"
+#line 12355 "scanner.c"
 			{
 #line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_parameters (self);
 #line 1485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12351 "scanner.c"
+#line 12361 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_READ:
-#line 12355 "scanner.c"
+#line 12365 "scanner.c"
 			{
 #line 1487 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_read (self);
 #line 1488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12361 "scanner.c"
+#line 12371 "scanner.c"
 			}
 			default:
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 12366 "scanner.c"
+#line 12376 "scanner.c"
 		}
 	}
 #line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = NULL;
 #line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12373 "scanner.c"
+#line 12383 "scanner.c"
 }
 
 
@@ -12389,7 +12399,7 @@ static gpointer _scanner_scan_thread_gthread_func (gpointer self) {
 	scanner_unref (self);
 #line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12384 "scanner.c"
+#line 12394 "scanner.c"
 }
 
 
@@ -12397,7 +12407,7 @@ void scanner_start (Scanner* self) {
 	GError * _inner_error_ = NULL;
 #line 1495 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 12392 "scanner.c"
+#line 12402 "scanner.c"
 	{
 		GThread* _tmp0_ = NULL;
 		GThread* _tmp1_ = NULL;
@@ -12407,8 +12417,8 @@ void scanner_start (Scanner* self) {
 #line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp1_;
 #line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_inner_error_ != NULL) {
-#line 12403 "scanner.c"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 12413 "scanner.c"
 			goto __catch15_g_error;
 		}
 #line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12421,7 +12431,7 @@ void scanner_start (Scanner* self) {
 		self->priv->thread = _tmp2_;
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (_tmp0_);
-#line 12416 "scanner.c"
+#line 12426 "scanner.c"
 	}
 	goto __finally15;
 	__catch15_g_error:
@@ -12441,18 +12451,18 @@ void scanner_start (Scanner* self) {
 		g_critical ("scanner.vala:1503: Unable to create thread: %s", _tmp4_);
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_error_free0 (e);
-#line 12436 "scanner.c"
+#line 12446 "scanner.c"
 	}
 	__finally15:
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #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/trunk/src/scanner.vala"
 		g_clear_error (&_inner_error_);
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 12447 "scanner.c"
+#line 12457 "scanner.c"
 	}
 }
 
@@ -12469,7 +12479,7 @@ void scanner_redetect (Scanner* self) {
 	if (_tmp0_) {
 #line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 12464 "scanner.c"
+#line 12474 "scanner.c"
 	}
 #line 1511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->need_redetect = TRUE;
@@ -12481,7 +12491,7 @@ void scanner_redetect (Scanner* self) {
 	_tmp2_ = request_redetect_new ();
 #line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
-#line 12476 "scanner.c"
+#line 12486 "scanner.c"
 }
 
 
@@ -12496,7 +12506,7 @@ gboolean scanner_is_scanning (Scanner* self) {
 	result = _tmp0_;
 #line 1520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12491 "scanner.c"
+#line 12501 "scanner.c"
 }
 
 
@@ -12511,7 +12521,7 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 	switch (_tmp0_) {
 #line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_DEFAULT:
-#line 12506 "scanner.c"
+#line 12516 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 1528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12520,11 +12530,11 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp1_;
 #line 1528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12515 "scanner.c"
+#line 12525 "scanner.c"
 		}
 #line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_COLOR:
-#line 12519 "scanner.c"
+#line 12529 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12533,11 +12543,11 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp2_;
 #line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12528 "scanner.c"
+#line 12538 "scanner.c"
 		}
 #line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_GRAY:
-#line 12532 "scanner.c"
+#line 12542 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12546,11 +12556,11 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp3_;
 #line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12541 "scanner.c"
+#line 12551 "scanner.c"
 		}
 #line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_LINEART:
-#line 12545 "scanner.c"
+#line 12555 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12559,7 +12569,7 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp4_;
 #line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12554 "scanner.c"
+#line 12564 "scanner.c"
 		}
 		default:
 		{
@@ -12573,7 +12583,7 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp6_;
 #line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12568 "scanner.c"
+#line 12578 "scanner.c"
 		}
 	}
 }
@@ -12590,7 +12600,7 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 	switch (_tmp0_) {
 #line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_SINGLE:
-#line 12585 "scanner.c"
+#line 12595 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12599,11 +12609,11 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp1_;
 #line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12594 "scanner.c"
+#line 12604 "scanner.c"
 		}
 #line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_FRONT:
-#line 12598 "scanner.c"
+#line 12608 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 1547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12612,11 +12622,11 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp2_;
 #line 1547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12607 "scanner.c"
+#line 12617 "scanner.c"
 		}
 #line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BACK:
-#line 12611 "scanner.c"
+#line 12621 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12625,11 +12635,11 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp3_;
 #line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12620 "scanner.c"
+#line 12630 "scanner.c"
 		}
 #line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BOTH:
-#line 12624 "scanner.c"
+#line 12634 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12638,7 +12648,7 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp4_;
 #line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12633 "scanner.c"
+#line 12643 "scanner.c"
 		}
 		default:
 		{
@@ -12652,7 +12662,7 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp6_;
 #line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12647 "scanner.c"
+#line 12657 "scanner.c"
 		}
 	}
 }
@@ -12723,17 +12733,17 @@ void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options) {
 	_tmp1_ = device;
 #line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ != NULL) {
-#line 12718 "scanner.c"
+#line 12728 "scanner.c"
 		const gchar* _tmp2_ = NULL;
 #line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = device;
 #line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
-#line 12724 "scanner.c"
+#line 12734 "scanner.c"
 	} else {
 #line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = "(null)";
-#line 12728 "scanner.c"
+#line 12738 "scanner.c"
 	}
 #line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = options;
@@ -12883,7 +12893,7 @@ void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options) {
 	g_async_queue_push (_tmp54_, _tmp55_);
 #line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_request_unref0 (request);
-#line 12876 "scanner.c"
+#line 12886 "scanner.c"
 }
 
 
@@ -12903,14 +12913,14 @@ void scanner_cancel (Scanner* self) {
 	_tmp2_ = request_cancel_new ();
 #line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
-#line 12896 "scanner.c"
+#line 12906 "scanner.c"
 }
 
 
 static gpointer _g_thread_ref0 (gpointer self) {
 #line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? g_thread_ref (self) : NULL;
-#line 12903 "scanner.c"
+#line 12913 "scanner.c"
 }
 
 
@@ -12932,7 +12942,7 @@ void scanner_free (Scanner* self) {
 	_tmp2_ = self->priv->thread;
 #line 1590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_ != NULL) {
-#line 12925 "scanner.c"
+#line 12935 "scanner.c"
 		GThread* _tmp3_ = NULL;
 		GThread* _tmp4_ = NULL;
 #line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12945,13 +12955,13 @@ void scanner_free (Scanner* self) {
 		_g_thread_unref0 (self->priv->thread);
 #line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->thread = NULL;
-#line 12938 "scanner.c"
+#line 12948 "scanner.c"
 	}
 #line 1596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	sane_exit ();
 #line 1597 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1597: sane_exit ()");
-#line 12944 "scanner.c"
+#line 12954 "scanner.c"
 }
 
 
@@ -12970,19 +12980,19 @@ static void g_cclosure_user_marshal_VOID__SCAN_PAGE_INFO (GClosure * closure, GV
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 12963 "scanner.c"
+#line 12973 "scanner.c"
 	} else {
 #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/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 12969 "scanner.c"
+#line 12979 "scanner.c"
 	}
 #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/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_page_info (param_values + 1), data2);
-#line 12975 "scanner.c"
+#line 12985 "scanner.c"
 }
 
 
@@ -13001,19 +13011,19 @@ static void g_cclosure_user_marshal_VOID__SCAN_LINE (GClosure * closure, GValue
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 12994 "scanner.c"
+#line 13004 "scanner.c"
 	} else {
 #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/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 13000 "scanner.c"
+#line 13010 "scanner.c"
 	}
 #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/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_line (param_values + 1), data2);
-#line 13006 "scanner.c"
+#line 13016 "scanner.c"
 }
 
 
@@ -13032,26 +13042,26 @@ static void g_cclosure_user_marshal_VOID__INT_STRING (GClosure * closure, GValue
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 13025 "scanner.c"
+#line 13035 "scanner.c"
 	} else {
 #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/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 13031 "scanner.c"
+#line 13041 "scanner.c"
 	}
 #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/trunk/src/scanner.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 13037 "scanner.c"
+#line 13047 "scanner.c"
 }
 
 
 static void value_scanner_init (GValue* value) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 13044 "scanner.c"
+#line 13054 "scanner.c"
 }
 
 
@@ -13060,7 +13070,7 @@ static void value_scanner_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (value->data[0].v_pointer);
-#line 13053 "scanner.c"
+#line 13063 "scanner.c"
 	}
 }
 
@@ -13070,11 +13080,11 @@ static void value_scanner_copy_value (const GValue* src_value, GValue* dest_valu
 	if (src_value->data[0].v_pointer) {
 #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 13063 "scanner.c"
+#line 13073 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 13067 "scanner.c"
+#line 13077 "scanner.c"
 	}
 }
 
@@ -13082,37 +13092,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/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 13075 "scanner.c"
+#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/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 13082 "scanner.c"
+#line 13092 "scanner.c"
 		Scanner* object;
 		object = collect_values[0].v_pointer;
 #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/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13089 "scanner.c"
+#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/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 13093 "scanner.c"
+#line 13103 "scanner.c"
 		}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scanner_ref (object);
-#line 13097 "scanner.c"
+#line 13107 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13101 "scanner.c"
+#line 13111 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 13105 "scanner.c"
+#line 13115 "scanner.c"
 }
 
 
@@ -13123,25 +13133,25 @@ static gchar* value_scanner_lcopy_value (const GValue* value, guint n_collect_va
 	if (!object_p) {
 #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 13116 "scanner.c"
+#line 13126 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 13122 "scanner.c"
+#line 13132 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 13126 "scanner.c"
+#line 13136 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scanner_ref (value->data[0].v_pointer);
-#line 13130 "scanner.c"
+#line 13140 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 13134 "scanner.c"
+#line 13144 "scanner.c"
 }
 
 
@@ -13155,7 +13165,7 @@ GParamSpec* param_spec_scanner (const gchar* name, const gchar* nick, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 13148 "scanner.c"
+#line 13158 "scanner.c"
 }
 
 
@@ -13164,7 +13174,7 @@ gpointer value_get_scanner (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCANNER), NULL);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 13157 "scanner.c"
+#line 13167 "scanner.c"
 }
 
 
@@ -13184,17 +13194,17 @@ void value_set_scanner (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_ref (value->data[0].v_pointer);
-#line 13177 "scanner.c"
+#line 13187 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13181 "scanner.c"
+#line 13191 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
-#line 13187 "scanner.c"
+#line 13197 "scanner.c"
 	}
 }
 
@@ -13213,17 +13223,17 @@ void value_take_scanner (GValue* value, gpointer v_object) {
 		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/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 13206 "scanner.c"
+#line 13216 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13210 "scanner.c"
+#line 13220 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
-#line 13216 "scanner.c"
+#line 13226 "scanner.c"
 	}
 }
 
@@ -13232,7 +13242,7 @@ static void scanner_class_init (ScannerClass * klass) {
 #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/trunk/src/scanner.vala"
-	SCANNER_CLASS (klass)->finalize = scanner_finalize;
+	((ScannerClass *) klass)->finalize = scanner_finalize;
 #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/trunk/src/scanner.vala"
@@ -13253,7 +13263,7 @@ static void scanner_class_init (ScannerClass * klass) {
 	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/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 13246 "scanner.c"
+#line 13256 "scanner.c"
 }
 
 
@@ -13262,7 +13272,7 @@ static void scanner_instance_init (Scanner * self) {
 	self->priv = SCANNER_GET_PRIVATE (self);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 13255 "scanner.c"
+#line 13265 "scanner.c"
 }
 
 
@@ -13270,6 +13280,8 @@ static void scanner_finalize (Scanner* obj) {
 	Scanner * self;
 #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/trunk/src/scanner.vala"
+	g_signal_handlers_destroy (self);
 #line 214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_thread_unref0 (self->priv->thread);
 #line 217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -13288,7 +13300,7 @@ static void scanner_finalize (Scanner* obj) {
 	_g_hash_table_unref0 (self->priv->options);
 #line 250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 13281 "scanner.c"
+#line 13293 "scanner.c"
 }
 
 
@@ -13313,7 +13325,7 @@ gpointer scanner_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 13306 "scanner.c"
+#line 13318 "scanner.c"
 }
 
 
@@ -13326,7 +13338,7 @@ void scanner_unref (gpointer instance) {
 		SCANNER_GET_CLASS (self)->finalize (self);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 13319 "scanner.c"
+#line 13331 "scanner.c"
 	}
 }