From e9ca3b0060facd753744602a3baca5a1effdbd83 Mon Sep 17 00:00:00 2001
From: Alessio Treglia <alessio@debian.org>
Date: Thu, 10 Apr 2014 15:37:02 +0100
Subject: Imported Upstream version 3.12.0

---
 src/scanner.c | 10103 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 5113 insertions(+), 4990 deletions(-)

(limited to 'src/scanner.c')

diff --git a/src/scanner.c b/src/scanner.c
index b67db5e..de389f6 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -1,4 +1,4 @@
-/* scanner.c generated by valac 0.20.1, the Vala compiler
+/* scanner.c generated by valac 0.22.1, the Vala compiler
  * generated from scanner.vala, do not modify */
 
 /*
@@ -936,6 +936,8 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gboolean value, gboolean* _result_);
 static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gint value, gint* _result_);
 static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gdouble value, gdouble* _result_);
+static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gdouble value, gdouble* _result_);
+static void scanner_set_option_to_max (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index);
 static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, const gchar* value, gchar** _result_);
 static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gchar** values, int values_length1, gchar** _result_);
 static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descriptor* option);
@@ -948,6 +950,7 @@ static void scanner_do_open (Scanner* self);
 static void _g_free0_ (gpointer var);
 static void scanner_do_get_option (Scanner* self);
 static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_Handle handle, const gchar* name, gint* index);
+static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor* option, gdouble size, gdouble dpi);
 static void scanner_do_complete_document (Scanner* self);
 static void scanner_do_start (Scanner* self);
 static void scanner_do_get_parameters (Scanner* self);
@@ -978,21 +981,21 @@ ScanDevice* scan_device_construct (GType object_type) {
 	self = (ScanDevice*) g_type_create_instance (object_type);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 982 "scanner.c"
+#line 985 "scanner.c"
 }
 
 
 ScanDevice* scan_device_new (void) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_device_construct (TYPE_SCAN_DEVICE);
-#line 989 "scanner.c"
+#line 992 "scanner.c"
 }
 
 
 static void value_scan_device_init (GValue* value) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 996 "scanner.c"
+#line 999 "scanner.c"
 }
 
 
@@ -1001,7 +1004,7 @@ static void value_scan_device_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (value->data[0].v_pointer);
-#line 1005 "scanner.c"
+#line 1008 "scanner.c"
 	}
 }
 
@@ -1011,11 +1014,11 @@ static void value_scan_device_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_device_ref (src_value->data[0].v_pointer);
-#line 1015 "scanner.c"
+#line 1018 "scanner.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1019 "scanner.c"
+#line 1022 "scanner.c"
 	}
 }
 
@@ -1023,37 +1026,37 @@ static void value_scan_device_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_scan_device_peek_pointer (const GValue* value) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1027 "scanner.c"
+#line 1030 "scanner.c"
 }
 
 
 static gchar* value_scan_device_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 1034 "scanner.c"
+#line 1037 "scanner.c"
 		ScanDevice* object;
 		object = collect_values[0].v_pointer;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1041 "scanner.c"
+#line 1044 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 14 "/home/bob/bzr/simple-scan/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 1045 "scanner.c"
+#line 1048 "scanner.c"
 		}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_device_ref (object);
-#line 1049 "scanner.c"
+#line 1052 "scanner.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1053 "scanner.c"
+#line 1056 "scanner.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1057 "scanner.c"
+#line 1060 "scanner.c"
 }
 
 
@@ -1064,25 +1067,25 @@ static gchar* value_scan_device_lcopy_value (const GValue* value, guint n_collec
 	if (!object_p) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1068 "scanner.c"
+#line 1071 "scanner.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 1074 "scanner.c"
+#line 1077 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1078 "scanner.c"
+#line 1081 "scanner.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_device_ref (value->data[0].v_pointer);
-#line 1082 "scanner.c"
+#line 1085 "scanner.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1086 "scanner.c"
+#line 1089 "scanner.c"
 }
 
 
@@ -1096,7 +1099,7 @@ GParamSpec* param_spec_scan_device (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 1100 "scanner.c"
+#line 1103 "scanner.c"
 }
 
 
@@ -1105,7 +1108,7 @@ gpointer value_get_scan_device (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_DEVICE), NULL);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1109 "scanner.c"
+#line 1112 "scanner.c"
 }
 
 
@@ -1125,17 +1128,17 @@ void value_set_scan_device (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_ref (value->data[0].v_pointer);
-#line 1129 "scanner.c"
+#line 1132 "scanner.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1133 "scanner.c"
+#line 1136 "scanner.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (old);
-#line 1139 "scanner.c"
+#line 1142 "scanner.c"
 	}
 }
 
@@ -1154,17 +1157,17 @@ void value_take_scan_device (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 1158 "scanner.c"
+#line 1161 "scanner.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1162 "scanner.c"
+#line 1165 "scanner.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (old);
-#line 1168 "scanner.c"
+#line 1171 "scanner.c"
 	}
 }
 
@@ -1174,14 +1177,14 @@ static void scan_device_class_init (ScanDeviceClass * klass) {
 	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;
-#line 1178 "scanner.c"
+#line 1181 "scanner.c"
 }
 
 
 static void scan_device_instance_init (ScanDevice * self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 1185 "scanner.c"
+#line 1188 "scanner.c"
 }
 
 
@@ -1193,7 +1196,7 @@ static void scan_device_finalize (ScanDevice* obj) {
 	_g_free0 (self->name);
 #line 17 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->label);
-#line 1197 "scanner.c"
+#line 1200 "scanner.c"
 }
 
 
@@ -1218,7 +1221,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 1222 "scanner.c"
+#line 1225 "scanner.c"
 }
 
 
@@ -1231,7 +1234,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 1235 "scanner.c"
+#line 1238 "scanner.c"
 	}
 }
 
@@ -1242,21 +1245,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 1246 "scanner.c"
+#line 1249 "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 1253 "scanner.c"
+#line 1256 "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 1260 "scanner.c"
+#line 1263 "scanner.c"
 }
 
 
@@ -1265,7 +1268,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 1269 "scanner.c"
+#line 1272 "scanner.c"
 	}
 }
 
@@ -1275,11 +1278,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 1279 "scanner.c"
+#line 1282 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1283 "scanner.c"
+#line 1286 "scanner.c"
 	}
 }
 
@@ -1287,37 +1290,37 @@ static void value_scan_page_info_copy_value (const GValue* src_value, GValue* de
 static gpointer value_scan_page_info_peek_pointer (const GValue* value) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1291 "scanner.c"
+#line 1294 "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 1298 "scanner.c"
+#line 1301 "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 1305 "scanner.c"
+#line 1308 "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 1309 "scanner.c"
+#line 1312 "scanner.c"
 		}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_page_info_ref (object);
-#line 1313 "scanner.c"
+#line 1316 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1317 "scanner.c"
+#line 1320 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1321 "scanner.c"
+#line 1324 "scanner.c"
 }
 
 
@@ -1328,25 +1331,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 1332 "scanner.c"
+#line 1335 "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 1338 "scanner.c"
+#line 1341 "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 1342 "scanner.c"
+#line 1345 "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 1346 "scanner.c"
+#line 1349 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1350 "scanner.c"
+#line 1353 "scanner.c"
 }
 
 
@@ -1360,7 +1363,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 1364 "scanner.c"
+#line 1367 "scanner.c"
 }
 
 
@@ -1369,7 +1372,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 1373 "scanner.c"
+#line 1376 "scanner.c"
 }
 
 
@@ -1389,17 +1392,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 1393 "scanner.c"
+#line 1396 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1397 "scanner.c"
+#line 1400 "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 1403 "scanner.c"
+#line 1406 "scanner.c"
 	}
 }
 
@@ -1418,17 +1421,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 1422 "scanner.c"
+#line 1425 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1426 "scanner.c"
+#line 1429 "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 1432 "scanner.c"
+#line 1435 "scanner.c"
 	}
 }
 
@@ -1438,14 +1441,14 @@ static void scan_page_info_class_init (ScanPageInfoClass * klass) {
 	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 1442 "scanner.c"
+#line 1445 "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 1449 "scanner.c"
+#line 1452 "scanner.c"
 }
 
 
@@ -1455,7 +1458,7 @@ static void scan_page_info_finalize (ScanPageInfo* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_PAGE_INFO, ScanPageInfo);
 #line 36 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->device);
-#line 1459 "scanner.c"
+#line 1462 "scanner.c"
 }
 
 
@@ -1480,7 +1483,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 1484 "scanner.c"
+#line 1487 "scanner.c"
 }
 
 
@@ -1493,7 +1496,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 1497 "scanner.c"
+#line 1500 "scanner.c"
 	}
 }
 
@@ -1504,21 +1507,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 1508 "scanner.c"
+#line 1511 "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 1515 "scanner.c"
+#line 1518 "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 1522 "scanner.c"
+#line 1525 "scanner.c"
 }
 
 
@@ -1527,7 +1530,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 1531 "scanner.c"
+#line 1534 "scanner.c"
 	}
 }
 
@@ -1537,11 +1540,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 1541 "scanner.c"
+#line 1544 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1545 "scanner.c"
+#line 1548 "scanner.c"
 	}
 }
 
@@ -1549,37 +1552,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 1553 "scanner.c"
+#line 1556 "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 1560 "scanner.c"
+#line 1563 "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 1567 "scanner.c"
+#line 1570 "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 1571 "scanner.c"
+#line 1574 "scanner.c"
 		}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_line_ref (object);
-#line 1575 "scanner.c"
+#line 1578 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1579 "scanner.c"
+#line 1582 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1583 "scanner.c"
+#line 1586 "scanner.c"
 }
 
 
@@ -1590,25 +1593,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 1594 "scanner.c"
+#line 1597 "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 1600 "scanner.c"
+#line 1603 "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 1604 "scanner.c"
+#line 1607 "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 1608 "scanner.c"
+#line 1611 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1612 "scanner.c"
+#line 1615 "scanner.c"
 }
 
 
@@ -1622,7 +1625,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 1626 "scanner.c"
+#line 1629 "scanner.c"
 }
 
 
@@ -1631,7 +1634,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 1635 "scanner.c"
+#line 1638 "scanner.c"
 }
 
 
@@ -1651,17 +1654,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 1655 "scanner.c"
+#line 1658 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1659 "scanner.c"
+#line 1662 "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 1665 "scanner.c"
+#line 1668 "scanner.c"
 	}
 }
 
@@ -1680,17 +1683,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 1684 "scanner.c"
+#line 1687 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1688 "scanner.c"
+#line 1691 "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 1694 "scanner.c"
+#line 1697 "scanner.c"
 	}
 }
 
@@ -1700,14 +1703,14 @@ static void scan_line_class_init (ScanLineClass * klass) {
 	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 1704 "scanner.c"
+#line 1707 "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 1711 "scanner.c"
+#line 1714 "scanner.c"
 }
 
 
@@ -1717,7 +1720,7 @@ static void scan_line_finalize (ScanLine* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_LINE, ScanLine);
 #line 55 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->data = (g_free (self->data), NULL);
-#line 1721 "scanner.c"
+#line 1724 "scanner.c"
 }
 
 
@@ -1742,7 +1745,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 1746 "scanner.c"
+#line 1749 "scanner.c"
 }
 
 
@@ -1755,7 +1758,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 1759 "scanner.c"
+#line 1762 "scanner.c"
 	}
 }
 
@@ -1790,21 +1793,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 1794 "scanner.c"
+#line 1797 "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 1801 "scanner.c"
+#line 1804 "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 1808 "scanner.c"
+#line 1811 "scanner.c"
 }
 
 
@@ -1813,7 +1816,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 1817 "scanner.c"
+#line 1820 "scanner.c"
 	}
 }
 
@@ -1823,11 +1826,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 1827 "scanner.c"
+#line 1830 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1831 "scanner.c"
+#line 1834 "scanner.c"
 	}
 }
 
@@ -1835,37 +1838,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 1839 "scanner.c"
+#line 1842 "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 1846 "scanner.c"
+#line 1849 "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 1853 "scanner.c"
+#line 1856 "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 1857 "scanner.c"
+#line 1860 "scanner.c"
 		}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_options_ref (object);
-#line 1861 "scanner.c"
+#line 1864 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1865 "scanner.c"
+#line 1868 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1869 "scanner.c"
+#line 1872 "scanner.c"
 }
 
 
@@ -1876,25 +1879,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 1880 "scanner.c"
+#line 1883 "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 1886 "scanner.c"
+#line 1889 "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 1890 "scanner.c"
+#line 1893 "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 1894 "scanner.c"
+#line 1897 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1898 "scanner.c"
+#line 1901 "scanner.c"
 }
 
 
@@ -1908,7 +1911,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 1912 "scanner.c"
+#line 1915 "scanner.c"
 }
 
 
@@ -1917,7 +1920,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 1921 "scanner.c"
+#line 1924 "scanner.c"
 }
 
 
@@ -1937,17 +1940,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 1941 "scanner.c"
+#line 1944 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1945 "scanner.c"
+#line 1948 "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 1951 "scanner.c"
+#line 1954 "scanner.c"
 	}
 }
 
@@ -1966,17 +1969,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 1970 "scanner.c"
+#line 1973 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1974 "scanner.c"
+#line 1977 "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 1980 "scanner.c"
+#line 1983 "scanner.c"
 	}
 }
 
@@ -1986,14 +1989,14 @@ static void scan_options_class_init (ScanOptionsClass * klass) {
 	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 1990 "scanner.c"
+#line 1993 "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 1997 "scanner.c"
+#line 2000 "scanner.c"
 }
 
 
@@ -2001,7 +2004,7 @@ 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 2005 "scanner.c"
+#line 2008 "scanner.c"
 }
 
 
@@ -2026,7 +2029,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 2030 "scanner.c"
+#line 2033 "scanner.c"
 }
 
 
@@ -2039,7 +2042,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 2043 "scanner.c"
+#line 2046 "scanner.c"
 	}
 }
 
@@ -2050,21 +2053,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 2054 "scanner.c"
+#line 2057 "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 2061 "scanner.c"
+#line 2064 "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 2068 "scanner.c"
+#line 2071 "scanner.c"
 }
 
 
@@ -2073,7 +2076,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 2077 "scanner.c"
+#line 2080 "scanner.c"
 	}
 }
 
@@ -2083,11 +2086,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 2087 "scanner.c"
+#line 2090 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2091 "scanner.c"
+#line 2094 "scanner.c"
 	}
 }
 
@@ -2095,37 +2098,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 2099 "scanner.c"
+#line 2102 "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 2106 "scanner.c"
+#line 2109 "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 2113 "scanner.c"
+#line 2116 "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 2117 "scanner.c"
+#line 2120 "scanner.c"
 		}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_job_ref (object);
-#line 2121 "scanner.c"
+#line 2124 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2125 "scanner.c"
+#line 2128 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2129 "scanner.c"
+#line 2132 "scanner.c"
 }
 
 
@@ -2136,25 +2139,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 2140 "scanner.c"
+#line 2143 "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 2146 "scanner.c"
+#line 2149 "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 2150 "scanner.c"
+#line 2153 "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 2154 "scanner.c"
+#line 2157 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2158 "scanner.c"
+#line 2161 "scanner.c"
 }
 
 
@@ -2168,7 +2171,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 2172 "scanner.c"
+#line 2175 "scanner.c"
 }
 
 
@@ -2177,7 +2180,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 2181 "scanner.c"
+#line 2184 "scanner.c"
 }
 
 
@@ -2197,17 +2200,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 2201 "scanner.c"
+#line 2204 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2205 "scanner.c"
+#line 2208 "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 2211 "scanner.c"
+#line 2214 "scanner.c"
 	}
 }
 
@@ -2226,17 +2229,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 2230 "scanner.c"
+#line 2233 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2234 "scanner.c"
+#line 2237 "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 2240 "scanner.c"
+#line 2243 "scanner.c"
 	}
 }
 
@@ -2246,14 +2249,14 @@ static void scan_job_class_init (ScanJobClass * klass) {
 	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 2250 "scanner.c"
+#line 2253 "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 2257 "scanner.c"
+#line 2260 "scanner.c"
 }
 
 
@@ -2263,7 +2266,7 @@ static void scan_job_finalize (ScanJob* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_JOB, ScanJob);
 #line 90 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->device);
-#line 2267 "scanner.c"
+#line 2270 "scanner.c"
 }
 
 
@@ -2288,7 +2291,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 2292 "scanner.c"
+#line 2295 "scanner.c"
 }
 
 
@@ -2301,7 +2304,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 2305 "scanner.c"
+#line 2308 "scanner.c"
 	}
 }
 
@@ -2312,21 +2315,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 2316 "scanner.c"
+#line 2319 "scanner.c"
 }
 
 
 Request* request_new (void) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_construct (TYPE_REQUEST);
-#line 2323 "scanner.c"
+#line 2326 "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 2330 "scanner.c"
+#line 2333 "scanner.c"
 }
 
 
@@ -2335,7 +2338,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 2339 "scanner.c"
+#line 2342 "scanner.c"
 	}
 }
 
@@ -2345,11 +2348,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 2349 "scanner.c"
+#line 2352 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2353 "scanner.c"
+#line 2356 "scanner.c"
 	}
 }
 
@@ -2357,37 +2360,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 2361 "scanner.c"
+#line 2364 "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 2368 "scanner.c"
+#line 2371 "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 2375 "scanner.c"
+#line 2378 "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 2379 "scanner.c"
+#line 2382 "scanner.c"
 		}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = request_ref (object);
-#line 2383 "scanner.c"
+#line 2386 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2387 "scanner.c"
+#line 2390 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2391 "scanner.c"
+#line 2394 "scanner.c"
 }
 
 
@@ -2398,25 +2401,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 2402 "scanner.c"
+#line 2405 "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 2408 "scanner.c"
+#line 2411 "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 2412 "scanner.c"
+#line 2415 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = request_ref (value->data[0].v_pointer);
-#line 2416 "scanner.c"
+#line 2419 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2420 "scanner.c"
+#line 2423 "scanner.c"
 }
 
 
@@ -2430,7 +2433,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 2434 "scanner.c"
+#line 2437 "scanner.c"
 }
 
 
@@ -2439,7 +2442,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 2443 "scanner.c"
+#line 2446 "scanner.c"
 }
 
 
@@ -2459,17 +2462,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 2463 "scanner.c"
+#line 2466 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2467 "scanner.c"
+#line 2470 "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 2473 "scanner.c"
+#line 2476 "scanner.c"
 	}
 }
 
@@ -2488,17 +2491,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 2492 "scanner.c"
+#line 2495 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2496 "scanner.c"
+#line 2499 "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 2502 "scanner.c"
+#line 2505 "scanner.c"
 	}
 }
 
@@ -2508,14 +2511,14 @@ static void request_class_init (RequestClass * klass) {
 	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 2512 "scanner.c"
+#line 2515 "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 2519 "scanner.c"
+#line 2522 "scanner.c"
 }
 
 
@@ -2523,7 +2526,7 @@ 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 2527 "scanner.c"
+#line 2530 "scanner.c"
 }
 
 
@@ -2548,7 +2551,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 2552 "scanner.c"
+#line 2555 "scanner.c"
 }
 
 
@@ -2561,7 +2564,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 2565 "scanner.c"
+#line 2568 "scanner.c"
 	}
 }
 
@@ -2572,21 +2575,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 2576 "scanner.c"
+#line 2579 "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 2583 "scanner.c"
+#line 2586 "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 2590 "scanner.c"
+#line 2593 "scanner.c"
 }
 
 
@@ -2612,21 +2615,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 2616 "scanner.c"
+#line 2619 "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 2623 "scanner.c"
+#line 2626 "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 2630 "scanner.c"
+#line 2633 "scanner.c"
 }
 
 
@@ -2652,14 +2655,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 2656 "scanner.c"
+#line 2659 "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 2663 "scanner.c"
+#line 2666 "scanner.c"
 }
 
 
@@ -2668,7 +2671,7 @@ static void request_start_scan_class_init (RequestStartScanClass * klass) {
 	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 2672 "scanner.c"
+#line 2675 "scanner.c"
 }
 
 
@@ -2684,7 +2687,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 2688 "scanner.c"
+#line 2691 "scanner.c"
 }
 
 
@@ -2706,21 +2709,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 2710 "scanner.c"
+#line 2713 "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 2717 "scanner.c"
+#line 2720 "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 2724 "scanner.c"
+#line 2727 "scanner.c"
 }
 
 
@@ -2746,21 +2749,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 2750 "scanner.c"
+#line 2753 "scanner.c"
 }
 
 
 Credentials* credentials_new (void) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return credentials_construct (TYPE_CREDENTIALS);
-#line 2757 "scanner.c"
+#line 2760 "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 2764 "scanner.c"
+#line 2767 "scanner.c"
 }
 
 
@@ -2769,7 +2772,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 2773 "scanner.c"
+#line 2776 "scanner.c"
 	}
 }
 
@@ -2779,11 +2782,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 2783 "scanner.c"
+#line 2786 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2787 "scanner.c"
+#line 2790 "scanner.c"
 	}
 }
 
@@ -2791,37 +2794,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 2795 "scanner.c"
+#line 2798 "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 2802 "scanner.c"
+#line 2805 "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 2809 "scanner.c"
+#line 2812 "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 2813 "scanner.c"
+#line 2816 "scanner.c"
 		}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = credentials_ref (object);
-#line 2817 "scanner.c"
+#line 2820 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2821 "scanner.c"
+#line 2824 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2825 "scanner.c"
+#line 2828 "scanner.c"
 }
 
 
@@ -2832,25 +2835,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 2836 "scanner.c"
+#line 2839 "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 2842 "scanner.c"
+#line 2845 "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 2846 "scanner.c"
+#line 2849 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = credentials_ref (value->data[0].v_pointer);
-#line 2850 "scanner.c"
+#line 2853 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2854 "scanner.c"
+#line 2857 "scanner.c"
 }
 
 
@@ -2864,7 +2867,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 2868 "scanner.c"
+#line 2871 "scanner.c"
 }
 
 
@@ -2873,7 +2876,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 2877 "scanner.c"
+#line 2880 "scanner.c"
 }
 
 
@@ -2893,17 +2896,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 2897 "scanner.c"
+#line 2900 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2901 "scanner.c"
+#line 2904 "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 2907 "scanner.c"
+#line 2910 "scanner.c"
 	}
 }
 
@@ -2922,17 +2925,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 2926 "scanner.c"
+#line 2929 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2930 "scanner.c"
+#line 2933 "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 2936 "scanner.c"
+#line 2939 "scanner.c"
 	}
 }
 
@@ -2942,14 +2945,14 @@ static void credentials_class_init (CredentialsClass * klass) {
 	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 2946 "scanner.c"
+#line 2949 "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 2953 "scanner.c"
+#line 2956 "scanner.c"
 }
 
 
@@ -2961,7 +2964,7 @@ static void credentials_finalize (Credentials* obj) {
 	_g_free0 (self->username);
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->password);
-#line 2965 "scanner.c"
+#line 2968 "scanner.c"
 }
 
 
@@ -2986,7 +2989,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 2990 "scanner.c"
+#line 2993 "scanner.c"
 }
 
 
@@ -2999,7 +3002,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 3003 "scanner.c"
+#line 3006 "scanner.c"
 	}
 }
 
@@ -3019,7 +3022,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 3023 "scanner.c"
+#line 3026 "scanner.c"
 }
 
 
@@ -3028,7 +3031,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 3032 "scanner.c"
+#line 3035 "scanner.c"
 }
 
 
@@ -3038,21 +3041,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 3042 "scanner.c"
+#line 3045 "scanner.c"
 }
 
 
 Notify* notify_new (void) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_construct (TYPE_NOTIFY);
-#line 3049 "scanner.c"
+#line 3052 "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 3056 "scanner.c"
+#line 3059 "scanner.c"
 }
 
 
@@ -3061,7 +3064,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 3065 "scanner.c"
+#line 3068 "scanner.c"
 	}
 }
 
@@ -3071,11 +3074,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 3075 "scanner.c"
+#line 3078 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3079 "scanner.c"
+#line 3082 "scanner.c"
 	}
 }
 
@@ -3083,37 +3086,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 3087 "scanner.c"
+#line 3090 "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 3094 "scanner.c"
+#line 3097 "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 3101 "scanner.c"
+#line 3104 "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 3105 "scanner.c"
+#line 3108 "scanner.c"
 		}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = notify_ref (object);
-#line 3109 "scanner.c"
+#line 3112 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 3113 "scanner.c"
+#line 3116 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 3117 "scanner.c"
+#line 3120 "scanner.c"
 }
 
 
@@ -3124,25 +3127,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 3128 "scanner.c"
+#line 3131 "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 3134 "scanner.c"
+#line 3137 "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 3138 "scanner.c"
+#line 3141 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = notify_ref (value->data[0].v_pointer);
-#line 3142 "scanner.c"
+#line 3145 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 3146 "scanner.c"
+#line 3149 "scanner.c"
 }
 
 
@@ -3156,7 +3159,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 3160 "scanner.c"
+#line 3163 "scanner.c"
 }
 
 
@@ -3165,7 +3168,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 3169 "scanner.c"
+#line 3172 "scanner.c"
 }
 
 
@@ -3185,17 +3188,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 3189 "scanner.c"
+#line 3192 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 3193 "scanner.c"
+#line 3196 "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 3199 "scanner.c"
+#line 3202 "scanner.c"
 	}
 }
 
@@ -3214,17 +3217,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 3218 "scanner.c"
+#line 3221 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 3222 "scanner.c"
+#line 3225 "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 3228 "scanner.c"
+#line 3231 "scanner.c"
 	}
 }
 
@@ -3236,14 +3239,14 @@ static void notify_class_init (NotifyClass * klass) {
 	NOTIFY_CLASS (klass)->finalize = notify_finalize;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_real_run;
-#line 3240 "scanner.c"
+#line 3243 "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 3247 "scanner.c"
+#line 3250 "scanner.c"
 }
 
 
@@ -3251,7 +3254,7 @@ 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 3255 "scanner.c"
+#line 3258 "scanner.c"
 }
 
 
@@ -3276,7 +3279,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 3280 "scanner.c"
+#line 3283 "scanner.c"
 }
 
 
@@ -3289,14 +3292,14 @@ 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 3293 "scanner.c"
+#line 3296 "scanner.c"
 	}
 }
 
 
 static void notify_scanning_changed_real_run (Notify* base, Scanner* scanner) {
 	NotifyScanningChanged * self;
-	Scanner* _tmp0_;
+	Scanner* _tmp0_ = NULL;
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyScanningChanged*) base;
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3305,7 +3308,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 3309 "scanner.c"
+#line 3312 "scanner.c"
 }
 
 
@@ -3315,14 +3318,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 3319 "scanner.c"
+#line 3322 "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 3326 "scanner.c"
+#line 3329 "scanner.c"
 }
 
 
@@ -3331,7 +3334,7 @@ static void notify_scanning_changed_class_init (NotifyScanningChangedClass * kla
 	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 3335 "scanner.c"
+#line 3338 "scanner.c"
 }
 
 
@@ -3354,7 +3357,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 3358 "scanner.c"
+#line 3361 "scanner.c"
 }
 
 
@@ -3363,13 +3366,13 @@ 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 3367 "scanner.c"
+#line 3370 "scanner.c"
 }
 
 
 NotifyUpdateDevices* notify_update_devices_construct (GType object_type, GList* devices) {
 	NotifyUpdateDevices* self = NULL;
-	GList* _tmp0_;
+	GList* _tmp0_ = NULL;
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyUpdateDevices*) notify_construct (object_type);
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3384,21 +3387,21 @@ 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 3388 "scanner.c"
+#line 3391 "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 3395 "scanner.c"
+#line 3398 "scanner.c"
 }
 
 
 static void notify_update_devices_real_run (Notify* base, Scanner* scanner) {
 	NotifyUpdateDevices * self;
-	Scanner* _tmp0_;
-	GList* _tmp1_;
+	Scanner* _tmp0_ = NULL;
+	GList* _tmp1_ = NULL;
 #line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyUpdateDevices*) base;
 #line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3409,7 +3412,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 3413 "scanner.c"
+#line 3416 "scanner.c"
 }
 
 
@@ -3422,14 +3425,14 @@ static void notify_update_devices_class_init (NotifyUpdateDevicesClass * klass)
 	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 3426 "scanner.c"
+#line 3429 "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 3433 "scanner.c"
+#line 3436 "scanner.c"
 }
 
 
@@ -3441,7 +3444,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 3445 "scanner.c"
+#line 3448 "scanner.c"
 }
 
 
@@ -3459,8 +3462,8 @@ GType notify_update_devices_get_type (void) {
 
 NotifyRequestAuthorization* notify_request_authorization_construct (GType object_type, const gchar* resource) {
 	NotifyRequestAuthorization* self = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (resource != NULL, NULL);
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3475,21 +3478,21 @@ 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 3479 "scanner.c"
+#line 3482 "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 3486 "scanner.c"
+#line 3489 "scanner.c"
 }
 
 
 static void notify_request_authorization_real_run (Notify* base, Scanner* scanner) {
 	NotifyRequestAuthorization * self;
-	Scanner* _tmp0_;
-	const gchar* _tmp1_;
+	Scanner* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyRequestAuthorization*) base;
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3500,7 +3503,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 3504 "scanner.c"
+#line 3507 "scanner.c"
 }
 
 
@@ -3513,14 +3516,14 @@ static void notify_request_authorization_class_init (NotifyRequestAuthorizationC
 	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 3517 "scanner.c"
+#line 3520 "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 3524 "scanner.c"
+#line 3527 "scanner.c"
 }
 
 
@@ -3532,7 +3535,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 3536 "scanner.c"
+#line 3539 "scanner.c"
 }
 
 
@@ -3550,9 +3553,9 @@ GType notify_request_authorization_get_type (void) {
 
 NotifyScanFailed* notify_scan_failed_construct (GType object_type, gint error_code, const gchar* error_string) {
 	NotifyScanFailed* self = NULL;
-	gint _tmp0_;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
+	gint _tmp0_ = 0;
+	const gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
 #line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (error_string != NULL, NULL);
 #line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3571,22 +3574,22 @@ 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 3575 "scanner.c"
+#line 3578 "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 3582 "scanner.c"
+#line 3585 "scanner.c"
 }
 
 
 static void notify_scan_failed_real_run (Notify* base, Scanner* scanner) {
 	NotifyScanFailed * self;
-	Scanner* _tmp0_;
-	gint _tmp1_;
-	const gchar* _tmp2_;
+	Scanner* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	const gchar* _tmp2_ = NULL;
 #line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyScanFailed*) base;
 #line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3599,7 +3602,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 3603 "scanner.c"
+#line 3606 "scanner.c"
 }
 
 
@@ -3612,14 +3615,14 @@ static void notify_scan_failed_class_init (NotifyScanFailedClass * klass) {
 	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 3616 "scanner.c"
+#line 3619 "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 3623 "scanner.c"
+#line 3626 "scanner.c"
 }
 
 
@@ -3631,7 +3634,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 3635 "scanner.c"
+#line 3638 "scanner.c"
 }
 
 
@@ -3649,7 +3652,7 @@ GType notify_scan_failed_get_type (void) {
 
 static void notify_document_done_real_run (Notify* base, Scanner* scanner) {
 	NotifyDocumentDone * self;
-	Scanner* _tmp0_;
+	Scanner* _tmp0_ = NULL;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyDocumentDone*) base;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3658,7 +3661,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 3662 "scanner.c"
+#line 3665 "scanner.c"
 }
 
 
@@ -3668,14 +3671,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 3672 "scanner.c"
+#line 3675 "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 3679 "scanner.c"
+#line 3682 "scanner.c"
 }
 
 
@@ -3684,7 +3687,7 @@ static void notify_document_done_class_init (NotifyDocumentDoneClass * klass) {
 	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 3688 "scanner.c"
+#line 3691 "scanner.c"
 }
 
 
@@ -3706,7 +3709,7 @@ GType notify_document_done_get_type (void) {
 
 static void notify_expect_page_real_run (Notify* base, Scanner* scanner) {
 	NotifyExpectPage * self;
-	Scanner* _tmp0_;
+	Scanner* _tmp0_ = NULL;
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyExpectPage*) base;
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3715,7 +3718,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 3719 "scanner.c"
+#line 3722 "scanner.c"
 }
 
 
@@ -3725,14 +3728,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 3729 "scanner.c"
+#line 3732 "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 3736 "scanner.c"
+#line 3739 "scanner.c"
 }
 
 
@@ -3741,7 +3744,7 @@ static void notify_expect_page_class_init (NotifyExpectPageClass * klass) {
 	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 3745 "scanner.c"
+#line 3748 "scanner.c"
 }
 
 
@@ -3764,15 +3767,15 @@ 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 3768 "scanner.c"
+#line 3771 "scanner.c"
 }
 
 
 NotifyGotPageInfo* notify_got_page_info_construct (GType object_type, gint job_id, ScanPageInfo* info) {
 	NotifyGotPageInfo* self = NULL;
-	gint _tmp0_;
-	ScanPageInfo* _tmp1_;
-	ScanPageInfo* _tmp2_;
+	gint _tmp0_ = 0;
+	ScanPageInfo* _tmp1_ = NULL;
+	ScanPageInfo* _tmp2_ = NULL;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (info != NULL, NULL);
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3791,24 +3794,24 @@ 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 3795 "scanner.c"
+#line 3798 "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 3802 "scanner.c"
+#line 3805 "scanner.c"
 }
 
 
 static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 	NotifyGotPageInfo * self;
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-	Scanner* _tmp2_;
-	gint _tmp3_;
-	gboolean _tmp7_;
+	gint _tmp1_ = 0;
+	Scanner* _tmp2_ = NULL;
+	gint _tmp3_ = 0;
+	gboolean _tmp7_ = FALSE;
 #line 178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotPageInfo*) base;
 #line 178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3821,10 +3824,10 @@ 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 3825 "scanner.c"
-		gint _tmp4_;
-		Scanner* _tmp5_;
-		gint _tmp6_;
+#line 3828 "scanner.c"
+		gint _tmp4_ = 0;
+		Scanner* _tmp5_ = NULL;
+		gint _tmp6_ = 0;
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = self->priv->job_id;
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3833,26 +3836,26 @@ 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 3837 "scanner.c"
+#line 3840 "scanner.c"
 	} else {
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 3841 "scanner.c"
+#line 3844 "scanner.c"
 	}
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = _tmp0_;
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp7_) {
-#line 3847 "scanner.c"
-		Scanner* _tmp8_;
-		ScanPageInfo* _tmp9_;
+#line 3850 "scanner.c"
+		Scanner* _tmp8_ = NULL;
+		ScanPageInfo* _tmp9_ = NULL;
 #line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = scanner;
 #line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->info;
 #line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp8_, "got-page-info", _tmp9_);
-#line 3856 "scanner.c"
+#line 3859 "scanner.c"
 	}
 }
 
@@ -3866,14 +3869,14 @@ static void notify_got_page_info_class_init (NotifyGotPageInfoClass * klass) {
 	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"
+#line 3873 "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 3880 "scanner.c"
 }
 
 
@@ -3885,7 +3888,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 3892 "scanner.c"
 }
 
 
@@ -3903,7 +3906,7 @@ GType notify_got_page_info_get_type (void) {
 
 NotifyPageDone* notify_page_done_construct (GType object_type, gint job_id) {
 	NotifyPageDone* self = NULL;
-	gint _tmp0_;
+	gint _tmp0_ = 0;
 #line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyPageDone*) notify_construct (object_type);
 #line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3912,24 +3915,24 @@ 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 3919 "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 3926 "scanner.c"
 }
 
 
 static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 	NotifyPageDone * self;
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-	Scanner* _tmp2_;
-	gint _tmp3_;
-	gboolean _tmp7_;
+	gint _tmp1_ = 0;
+	Scanner* _tmp2_ = NULL;
+	gint _tmp3_ = 0;
+	gboolean _tmp7_ = FALSE;
 #line 189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyPageDone*) base;
 #line 189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3942,10 +3945,10 @@ 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 3946 "scanner.c"
-		gint _tmp4_;
-		Scanner* _tmp5_;
-		gint _tmp6_;
+#line 3949 "scanner.c"
+		gint _tmp4_ = 0;
+		Scanner* _tmp5_ = NULL;
+		gint _tmp6_ = 0;
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = self->priv->job_id;
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3954,23 +3957,23 @@ 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 3958 "scanner.c"
+#line 3961 "scanner.c"
 	} else {
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 3962 "scanner.c"
+#line 3965 "scanner.c"
 	}
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = _tmp0_;
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp7_) {
-#line 3968 "scanner.c"
-		Scanner* _tmp8_;
+#line 3971 "scanner.c"
+		Scanner* _tmp8_ = NULL;
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = scanner;
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp8_, "page-done");
-#line 3974 "scanner.c"
+#line 3977 "scanner.c"
 	}
 }
 
@@ -3984,14 +3987,14 @@ static void notify_page_done_class_init (NotifyPageDoneClass * klass) {
 	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 3988 "scanner.c"
+#line 3991 "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 3995 "scanner.c"
+#line 3998 "scanner.c"
 }
 
 
@@ -4001,7 +4004,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 4005 "scanner.c"
+#line 4008 "scanner.c"
 }
 
 
@@ -4020,15 +4023,15 @@ 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 4024 "scanner.c"
+#line 4027 "scanner.c"
 }
 
 
 NotifyGotLine* notify_got_line_construct (GType object_type, gint job_id, ScanLine* line) {
 	NotifyGotLine* self = NULL;
-	gint _tmp0_;
-	ScanLine* _tmp1_;
-	ScanLine* _tmp2_;
+	gint _tmp0_ = 0;
+	ScanLine* _tmp1_ = NULL;
+	ScanLine* _tmp2_ = NULL;
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (line != NULL, NULL);
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4047,24 +4050,24 @@ 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 4051 "scanner.c"
+#line 4054 "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 4058 "scanner.c"
+#line 4061 "scanner.c"
 }
 
 
 static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 	NotifyGotLine * self;
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-	Scanner* _tmp2_;
-	gint _tmp3_;
-	gboolean _tmp7_;
+	gint _tmp1_ = 0;
+	Scanner* _tmp2_ = NULL;
+	gint _tmp3_ = 0;
+	gboolean _tmp7_ = FALSE;
 #line 201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotLine*) base;
 #line 201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4077,10 +4080,10 @@ 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 4081 "scanner.c"
-		gint _tmp4_;
-		Scanner* _tmp5_;
-		gint _tmp6_;
+#line 4084 "scanner.c"
+		gint _tmp4_ = 0;
+		Scanner* _tmp5_ = NULL;
+		gint _tmp6_ = 0;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = self->priv->job_id;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4089,26 +4092,26 @@ 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 4093 "scanner.c"
+#line 4096 "scanner.c"
 	} else {
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 4097 "scanner.c"
+#line 4100 "scanner.c"
 	}
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = _tmp0_;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp7_) {
-#line 4103 "scanner.c"
-		Scanner* _tmp8_;
-		ScanLine* _tmp9_;
+#line 4106 "scanner.c"
+		Scanner* _tmp8_ = NULL;
+		ScanLine* _tmp9_ = NULL;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = scanner;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->line;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp8_, "got-line", _tmp9_);
-#line 4112 "scanner.c"
+#line 4115 "scanner.c"
 	}
 }
 
@@ -4122,14 +4125,14 @@ static void notify_got_line_class_init (NotifyGotLineClass * klass) {
 	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 4126 "scanner.c"
+#line 4129 "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 4133 "scanner.c"
+#line 4136 "scanner.c"
 }
 
 
@@ -4141,7 +4144,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 4145 "scanner.c"
+#line 4148 "scanner.c"
 }
 
 
@@ -4160,7 +4163,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 4164 "scanner.c"
+#line 4167 "scanner.c"
 }
 
 
@@ -4169,36 +4172,36 @@ 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 4173 "scanner.c"
+#line 4176 "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 4180 "scanner.c"
+#line 4183 "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 4187 "scanner.c"
+#line 4190 "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 4194 "scanner.c"
+#line 4197 "scanner.c"
 }
 
 
 static Scanner* scanner_construct (GType object_type) {
 	Scanner* self = NULL;
-	GAsyncQueue* _tmp0_;
-	GAsyncQueue* _tmp1_;
-	GAsyncQueue* _tmp2_;
+	GAsyncQueue* _tmp0_ = NULL;
+	GAsyncQueue* _tmp1_ = NULL;
+	GAsyncQueue* _tmp2_ = NULL;
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (Scanner*) g_type_create_instance (object_type);
 #line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4221,42 +4224,42 @@ 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 4225 "scanner.c"
+#line 4228 "scanner.c"
 }
 
 
 static Scanner* scanner_new (void) {
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scanner_construct (TYPE_SCANNER);
-#line 4232 "scanner.c"
+#line 4235 "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 4239 "scanner.c"
+#line 4242 "scanner.c"
 }
 
 
 Scanner* scanner_get_instance (void) {
 	Scanner* result = NULL;
-	Scanner* _tmp0_;
-	Scanner* _tmp2_;
-	Scanner* _tmp3_;
+	Scanner* _tmp0_ = NULL;
+	Scanner* _tmp2_ = NULL;
+	Scanner* _tmp3_ = NULL;
 #line 280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner_scanner_object;
 #line 280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_ == NULL) {
-#line 4252 "scanner.c"
-		Scanner* _tmp1_;
+#line 4255 "scanner.c"
+		Scanner* _tmp1_ = NULL;
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = scanner_new ();
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scanner_unref0 (scanner_scanner_object);
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_scanner_object = _tmp1_;
-#line 4260 "scanner.c"
+#line 4263 "scanner.c"
 	}
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner_scanner_object;
@@ -4266,15 +4269,15 @@ Scanner* scanner_get_instance (void) {
 	result = _tmp3_;
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4270 "scanner.c"
+#line 4273 "scanner.c"
 }
 
 
 static gboolean scanner_notify_idle_cb (Scanner* self) {
 	gboolean result = FALSE;
-	GAsyncQueue* _tmp0_;
+	Notify* notification = NULL;
+	GAsyncQueue* _tmp0_ = NULL;
 	gpointer _tmp1_ = NULL;
-	Notify* notification;
 #line 285 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4291,14 +4294,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 4295 "scanner.c"
+#line 4298 "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 4302 "scanner.c"
+#line 4305 "scanner.c"
 }
 
 
@@ -4307,14 +4310,14 @@ static gboolean _scanner_notify_idle_cb_gsource_func (gpointer self) {
 	result = scanner_notify_idle_cb (self);
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4311 "scanner.c"
+#line 4314 "scanner.c"
 }
 
 
 static void scanner_notify (Scanner* self, Notify* notification) {
-	GAsyncQueue* _tmp0_;
-	Notify* _tmp1_;
-	Notify* _tmp2_;
+	GAsyncQueue* _tmp0_ = NULL;
+	Notify* _tmp1_ = NULL;
+	Notify* _tmp2_ = NULL;
 #line 292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4329,33 +4332,33 @@ 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 4333 "scanner.c"
+#line 4336 "scanner.c"
 }
 
 
 static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_;
-	gboolean _tmp4_;
-	gboolean _tmp9_;
+	gboolean _tmp2_ = FALSE;
+	gboolean _tmp4_ = FALSE;
+	gboolean _tmp9_ = FALSE;
 #line 298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_) {
-#line 4349 "scanner.c"
-		gboolean _tmp3_;
+#line 4352 "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 4355 "scanner.c"
+#line 4358 "scanner.c"
 	} else {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = FALSE;
-#line 4359 "scanner.c"
+#line 4362 "scanner.c"
 	}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp1_;
@@ -4363,41 +4366,41 @@ static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 	if (_tmp4_) {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = TRUE;
-#line 4367 "scanner.c"
+#line 4370 "scanner.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
-		gboolean _tmp6_;
-		gboolean _tmp8_;
+		gboolean _tmp6_ = FALSE;
+		gboolean _tmp8_ = FALSE;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = self->priv->scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (!_tmp6_) {
-#line 4376 "scanner.c"
-			gboolean _tmp7_;
+#line 4379 "scanner.c"
+			gboolean _tmp7_ = FALSE;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = is_scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = _tmp7_;
-#line 4382 "scanner.c"
+#line 4385 "scanner.c"
 		} else {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = FALSE;
-#line 4386 "scanner.c"
+#line 4389 "scanner.c"
 		}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = _tmp5_;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp8_;
-#line 4392 "scanner.c"
+#line 4395 "scanner.c"
 	}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = _tmp0_;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_) {
-#line 4398 "scanner.c"
-		gboolean _tmp10_;
-		NotifyScanningChanged* _tmp11_;
-		NotifyScanningChanged* _tmp12_;
+#line 4401 "scanner.c"
+		gboolean _tmp10_ = FALSE;
+		NotifyScanningChanged* _tmp11_ = NULL;
+		NotifyScanningChanged* _tmp12_ = NULL;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = is_scanning;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4410,36 +4413,36 @@ static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 		scanner_notify (self, (Notify*) _tmp12_);
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp12_);
-#line 4414 "scanner.c"
+#line 4417 "scanner.c"
 	}
 }
 
 
 static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_;
+	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1238 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1238 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1239 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1239 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1239 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1239 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	return result;
-#line 4435 "scanner.c"
+#line 4438 "scanner.c"
 }
 
 
 static gint scanner_get_device_weight (const gchar* device) {
 	gint result = 0;
-	const gchar* _tmp0_;
+	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_;
+	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 #line 307 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (device != NULL, 0);
@@ -4453,7 +4456,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 4457 "scanner.c"
+#line 4460 "scanner.c"
 	}
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = device;
@@ -4465,33 +4468,33 @@ 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 4469 "scanner.c"
+#line 4472 "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 4475 "scanner.c"
+#line 4478 "scanner.c"
 }
 
 
 static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 	gint result = 0;
-	ScanDevice* _tmp0_;
-	const gchar* _tmp1_;
+	gint weight1 = 0;
+	ScanDevice* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-	gint weight1;
-	ScanDevice* _tmp3_;
-	const gchar* _tmp4_;
+	gint weight2 = 0;
+	ScanDevice* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
-	gint weight2;
-	gint _tmp6_;
-	gint _tmp7_;
-	GCompareFunc _tmp10_;
-	ScanDevice* _tmp11_;
-	const gchar* _tmp12_;
-	ScanDevice* _tmp13_;
-	const gchar* _tmp14_;
+	gint _tmp6_ = 0;
+	gint _tmp7_ = 0;
+	GCompareFunc _tmp10_ = NULL;
+	ScanDevice* _tmp11_ = NULL;
+	const gchar* _tmp12_ = NULL;
+	ScanDevice* _tmp13_ = NULL;
+	const gchar* _tmp14_ = NULL;
 	gint _tmp15_ = 0;
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (device1 != NULL, 0);
@@ -4519,9 +4522,9 @@ 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 4523 "scanner.c"
-		gint _tmp8_;
-		gint _tmp9_;
+#line 4526 "scanner.c"
+		gint _tmp8_ = 0;
+		gint _tmp9_ = 0;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = weight1;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4530,7 +4533,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 4534 "scanner.c"
+#line 4537 "scanner.c"
 	}
 #line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = g_strcmp0;
@@ -4548,176 +4551,176 @@ 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 4552 "scanner.c"
+#line 4555 "scanner.c"
 }
 
 
 static gchar* sane_status_to_string (SANE_Status status) {
 	gchar* result = NULL;
-	SANE_Status _tmp0_;
+	SANE_Status _tmp0_ = 0;
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	_tmp0_ = status;
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	switch (_tmp0_) {
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_GOOD:
-#line 4565 "scanner.c"
+#line 4568 "scanner.c"
 		{
-			gchar* _tmp1_;
+			gchar* _tmp1_ = NULL;
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp1_ = g_strdup ("SANE_STATUS_GOOD");
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp1_;
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4574 "scanner.c"
+#line 4577 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_UNSUPPORTED:
-#line 4578 "scanner.c"
+#line 4581 "scanner.c"
 		{
-			gchar* _tmp2_;
+			gchar* _tmp2_ = NULL;
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp2_ = g_strdup ("SANE_STATUS_UNSUPPORTED");
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp2_;
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4587 "scanner.c"
+#line 4590 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_CANCELLED:
-#line 4591 "scanner.c"
+#line 4594 "scanner.c"
 		{
-			gchar* _tmp3_;
+			gchar* _tmp3_ = NULL;
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp3_ = g_strdup ("SANE_STATUS_CANCELLED");
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp3_;
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4600 "scanner.c"
+#line 4603 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_DEVICE_BUSY:
-#line 4604 "scanner.c"
+#line 4607 "scanner.c"
 		{
-			gchar* _tmp4_;
+			gchar* _tmp4_ = NULL;
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp4_ = g_strdup ("SANE_STATUS_DEVICE_BUSY");
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp4_;
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4613 "scanner.c"
+#line 4616 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_INVAL:
-#line 4617 "scanner.c"
+#line 4620 "scanner.c"
 		{
-			gchar* _tmp5_;
+			gchar* _tmp5_ = NULL;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp5_ = g_strdup ("SANE_STATUS_INVAL");
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp5_;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4626 "scanner.c"
+#line 4629 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_EOF:
-#line 4630 "scanner.c"
+#line 4633 "scanner.c"
 		{
-			gchar* _tmp6_;
+			gchar* _tmp6_ = NULL;
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp6_ = g_strdup ("SANE_STATUS_EOF");
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp6_;
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4639 "scanner.c"
+#line 4642 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_JAMMED:
-#line 4643 "scanner.c"
+#line 4646 "scanner.c"
 		{
-			gchar* _tmp7_;
+			gchar* _tmp7_ = NULL;
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp7_ = g_strdup ("SANE_STATUS_JAMMED");
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp7_;
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4652 "scanner.c"
+#line 4655 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_DOCS:
-#line 4656 "scanner.c"
+#line 4659 "scanner.c"
 		{
-			gchar* _tmp8_;
+			gchar* _tmp8_ = NULL;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp8_ = g_strdup ("SANE_STATUS_NO_DOCS");
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp8_;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4665 "scanner.c"
+#line 4668 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_COVER_OPEN:
-#line 4669 "scanner.c"
+#line 4672 "scanner.c"
 		{
-			gchar* _tmp9_;
+			gchar* _tmp9_ = NULL;
 #line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp9_ = g_strdup ("SANE_STATUS_COVER_OPEN");
 #line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp9_;
 #line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4678 "scanner.c"
+#line 4681 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_IO_ERROR:
-#line 4682 "scanner.c"
+#line 4685 "scanner.c"
 		{
-			gchar* _tmp10_;
+			gchar* _tmp10_ = NULL;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp10_ = g_strdup ("SANE_STATUS_IO_ERROR");
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp10_;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4691 "scanner.c"
+#line 4694 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_MEM:
-#line 4695 "scanner.c"
+#line 4698 "scanner.c"
 		{
-			gchar* _tmp11_;
+			gchar* _tmp11_ = NULL;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp11_ = g_strdup ("SANE_STATUS_NO_MEM");
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp11_;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4704 "scanner.c"
+#line 4707 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_ACCESS_DENIED:
-#line 4708 "scanner.c"
+#line 4711 "scanner.c"
 		{
-			gchar* _tmp12_;
+			gchar* _tmp12_ = NULL;
 #line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp12_ = g_strdup ("SANE_STATUS_ACCESS_DENIED");
 #line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp12_;
 #line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4717 "scanner.c"
+#line 4720 "scanner.c"
 		}
 		default:
 		{
-			SANE_Status _tmp13_;
+			SANE_Status _tmp13_ = 0;
 			gchar* _tmp14_ = NULL;
 #line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp13_ = status;
@@ -4727,7 +4730,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 4731 "scanner.c"
+#line 4734 "scanner.c"
 		}
 	}
 }
@@ -4736,112 +4739,112 @@ 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 1242 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1242 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1242 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 4746 "scanner.c"
+#line 4749 "scanner.c"
 	{
-		const gchar* _tmp0_;
+		GRegex* regex = NULL;
+		const gchar* _tmp0_ = NULL;
 		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_;
-		GRegex* _tmp3_;
-		GRegex* _tmp4_;
-		GRegex* regex;
-		GRegex* _tmp5_;
-		const gchar* _tmp6_;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_;
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+		gchar* _tmp2_ = NULL;
+		GRegex* _tmp3_ = NULL;
+		GRegex* _tmp4_ = NULL;
+		gchar* _tmp5_ = NULL;
+		GRegex* _tmp6_ = NULL;
+		const gchar* _tmp7_ = NULL;
+		gchar* _tmp8_ = NULL;
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		if (_inner_error_ != NULL) {
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4776 "scanner.c"
+#line 4779 "scanner.c"
 				goto __catch14_g_regex_error;
 			}
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/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 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1244 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4785 "scanner.c"
+#line 4788 "scanner.c"
 		}
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-		_tmp5_ = regex;
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-		_tmp6_ = replacement;
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-		_tmp7_ = g_regex_replace_literal (_tmp5_, self, (gssize) (-1), 0, _tmp6_, 0, &_inner_error_);
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-		_tmp8_ = _tmp7_;
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+		_tmp6_ = regex;
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+		_tmp7_ = replacement;
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) (-1), 0, _tmp7_, 0, &_inner_error_);
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+		_tmp5_ = _tmp8_;
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		if (_inner_error_ != NULL) {
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4801 "scanner.c"
+#line 4804 "scanner.c"
 				goto __catch14_g_regex_error;
 			}
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/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 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4812 "scanner.c"
+#line 4815 "scanner.c"
 		}
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
-		result = _tmp8_;
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+		result = _tmp5_;
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1245 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		return result;
-#line 4820 "scanner.c"
+#line 4823 "scanner.c"
 	}
 	goto __finally14;
 	__catch14_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1247 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1246 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 4834 "scanner.c"
+#line 4837 "scanner.c"
 	}
 	__finally14:
-#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	if (_inner_error_ != NULL) {
-#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.22/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 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1243 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 		return NULL;
-#line 4845 "scanner.c"
+#line 4848 "scanner.c"
 	}
 }
 
@@ -4849,7 +4852,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 4853 "scanner.c"
+#line 4856 "scanner.c"
 }
 
 
@@ -4858,26 +4861,26 @@ static gint _scanner_compare_devices_gcompare_func (gconstpointer a, gconstpoint
 	result = scanner_compare_devices (a, b);
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4862 "scanner.c"
+#line 4865 "scanner.c"
 }
 
 
 static void scanner_do_redetect (Scanner* self) {
-	SANE_Device** device_list;
-	gint device_list_length1;
-	gint _device_list_size_;
+	SANE_Device** device_list = NULL;
+	gint device_list_length1 = 0;
+	gint _device_list_size_ = 0;
+	SANE_Status status = 0;
 	SANE_Device** _tmp0_ = NULL;
 	SANE_Status _tmp1_ = 0;
-	SANE_Status status;
-	SANE_Status _tmp2_;
+	SANE_Status _tmp2_ = 0;
 	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_;
-	SANE_Status _tmp5_;
-	GList* devices;
-	GList* _tmp57_;
-	GList* _tmp64_;
-	NotifyUpdateDevices* _tmp65_;
-	NotifyUpdateDevices* _tmp66_;
+	gchar* _tmp4_ = NULL;
+	SANE_Status _tmp5_ = 0;
+	GList* devices = NULL;
+	GList* _tmp57_ = NULL;
+	GList* _tmp64_ = NULL;
+	NotifyUpdateDevices* _tmp65_ = NULL;
+	NotifyUpdateDevices* _tmp66_ = NULL;
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4910,8 +4913,8 @@ 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 4914 "scanner.c"
-		SANE_Status _tmp6_;
+#line 4917 "scanner.c"
+		SANE_Status _tmp6_ = 0;
 		const gchar* _tmp7_ = NULL;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = status;
@@ -4925,90 +4928,90 @@ 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 4929 "scanner.c"
+#line 4932 "scanner.c"
 	}
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = NULL;
-#line 4933 "scanner.c"
+#line 4936 "scanner.c"
 	{
-		gint i;
+		gint i = 0;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 4938 "scanner.c"
+#line 4941 "scanner.c"
 		{
-			gboolean _tmp8_;
+			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 4945 "scanner.c"
-				gboolean _tmp9_;
-				SANE_Device** _tmp11_;
-				gint _tmp11__length1;
-				gint _tmp12_;
-				SANE_Device* _tmp13_;
-				SANE_Device** _tmp14_;
-				gint _tmp14__length1;
-				gint _tmp15_;
-				SANE_Device* _tmp16_;
-				const gchar* _tmp17_;
-				SANE_Device** _tmp18_;
-				gint _tmp18__length1;
-				gint _tmp19_;
-				SANE_Device* _tmp20_;
-				const gchar* _tmp21_;
-				SANE_Device** _tmp22_;
-				gint _tmp22__length1;
-				gint _tmp23_;
-				SANE_Device* _tmp24_;
-				const gchar* _tmp25_;
-				SANE_Device** _tmp26_;
-				gint _tmp26__length1;
-				gint _tmp27_;
-				SANE_Device* _tmp28_;
-				const gchar* _tmp29_;
-				ScanDevice* _tmp30_;
-				ScanDevice* scan_device;
-				ScanDevice* _tmp31_;
-				SANE_Device** _tmp32_;
-				gint _tmp32__length1;
-				gint _tmp33_;
-				SANE_Device* _tmp34_;
-				const gchar* _tmp35_;
-				gchar* _tmp36_;
-				SANE_Device** _tmp37_;
-				gint _tmp37__length1;
-				gint _tmp38_;
-				SANE_Device* _tmp39_;
-				const gchar* _tmp40_;
-				gchar* _tmp41_;
-				gchar* vendor;
-				const gchar* _tmp42_;
-				ScanDevice* _tmp44_;
-				const gchar* _tmp45_;
-				SANE_Device** _tmp46_;
-				gint _tmp46__length1;
-				gint _tmp47_;
-				SANE_Device* _tmp48_;
-				const gchar* _tmp49_;
+#line 4948 "scanner.c"
+				gboolean _tmp9_ = FALSE;
+				SANE_Device** _tmp11_ = NULL;
+				gint _tmp11__length1 = 0;
+				gint _tmp12_ = 0;
+				SANE_Device* _tmp13_ = NULL;
+				SANE_Device** _tmp14_ = NULL;
+				gint _tmp14__length1 = 0;
+				gint _tmp15_ = 0;
+				SANE_Device* _tmp16_ = NULL;
+				const gchar* _tmp17_ = NULL;
+				SANE_Device** _tmp18_ = NULL;
+				gint _tmp18__length1 = 0;
+				gint _tmp19_ = 0;
+				SANE_Device* _tmp20_ = NULL;
+				const gchar* _tmp21_ = NULL;
+				SANE_Device** _tmp22_ = NULL;
+				gint _tmp22__length1 = 0;
+				gint _tmp23_ = 0;
+				SANE_Device* _tmp24_ = NULL;
+				const gchar* _tmp25_ = NULL;
+				SANE_Device** _tmp26_ = NULL;
+				gint _tmp26__length1 = 0;
+				gint _tmp27_ = 0;
+				SANE_Device* _tmp28_ = NULL;
+				const gchar* _tmp29_ = NULL;
+				ScanDevice* scan_device = NULL;
+				ScanDevice* _tmp30_ = NULL;
+				ScanDevice* _tmp31_ = NULL;
+				SANE_Device** _tmp32_ = NULL;
+				gint _tmp32__length1 = 0;
+				gint _tmp33_ = 0;
+				SANE_Device* _tmp34_ = NULL;
+				const gchar* _tmp35_ = NULL;
+				gchar* _tmp36_ = NULL;
+				gchar* vendor = NULL;
+				SANE_Device** _tmp37_ = NULL;
+				gint _tmp37__length1 = 0;
+				gint _tmp38_ = 0;
+				SANE_Device* _tmp39_ = NULL;
+				const gchar* _tmp40_ = NULL;
+				gchar* _tmp41_ = NULL;
+				const gchar* _tmp42_ = NULL;
+				ScanDevice* _tmp44_ = NULL;
+				const gchar* _tmp45_ = NULL;
+				SANE_Device** _tmp46_ = NULL;
+				gint _tmp46__length1 = 0;
+				gint _tmp47_ = 0;
+				SANE_Device* _tmp48_ = NULL;
+				const gchar* _tmp49_ = NULL;
 				gchar* _tmp50_ = NULL;
-				ScanDevice* _tmp51_;
-				const gchar* _tmp52_;
+				ScanDevice* _tmp51_ = NULL;
+				const gchar* _tmp52_ = NULL;
 				gchar* _tmp53_ = NULL;
-				gchar* _tmp54_;
-				ScanDevice* _tmp55_;
-				ScanDevice* _tmp56_;
+				gchar* _tmp54_ = NULL;
+				ScanDevice* _tmp55_ = NULL;
+				ScanDevice* _tmp56_ = NULL;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp9_ = _tmp8_;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp9_) {
-#line 5006 "scanner.c"
-					gint _tmp10_;
+#line 5009 "scanner.c"
+					gint _tmp10_ = 0;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp10_ = i;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp10_ + 1;
-#line 5012 "scanner.c"
+#line 5015 "scanner.c"
 				}
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = FALSE;
@@ -5024,7 +5027,7 @@ static void scanner_do_redetect (Scanner* self) {
 				if (!(_tmp13_ != NULL)) {
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 5028 "scanner.c"
+#line 5031 "scanner.c"
 				}
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp14_ = device_list;
@@ -5109,15 +5112,15 @@ static void scanner_do_redetect (Scanner* self) {
 				_tmp42_ = vendor;
 #line 358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (g_strcmp0 (_tmp42_, "Hewlett-Packard") == 0) {
-#line 5112 "scanner.c"
-					gchar* _tmp43_;
+#line 5115 "scanner.c"
+					gchar* _tmp43_ = NULL;
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp43_ = g_strdup ("HP");
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_g_free0 (vendor);
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					vendor = _tmp43_;
-#line 5120 "scanner.c"
+#line 5123 "scanner.c"
 				}
 #line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp44_ = scan_device;
@@ -5159,7 +5162,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 5162 "scanner.c"
+#line 5165 "scanner.c"
 			}
 		}
 	}
@@ -5173,14 +5176,14 @@ static void scanner_do_redetect (Scanner* self) {
 	_tmp57_ = devices;
 #line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp57_ != NULL) {
-#line 5176 "scanner.c"
-		GList* _tmp58_;
+#line 5179 "scanner.c"
+		ScanDevice* device = NULL;
+		GList* _tmp58_ = NULL;
 		gconstpointer _tmp59_ = NULL;
-		ScanDevice* _tmp60_;
-		ScanDevice* device;
-		ScanDevice* _tmp61_;
-		const gchar* _tmp62_;
-		gchar* _tmp63_;
+		ScanDevice* _tmp60_ = NULL;
+		ScanDevice* _tmp61_ = NULL;
+		const gchar* _tmp62_ = NULL;
+		gchar* _tmp63_ = NULL;
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp58_ = devices;
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5201,13 +5204,13 @@ static void scanner_do_redetect (Scanner* self) {
 		self->priv->default_device = _tmp63_;
 #line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_device_unref0 (device);
-#line 5204 "scanner.c"
+#line 5207 "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 5210 "scanner.c"
+#line 5213 "scanner.c"
 	}
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp64_ = devices;
@@ -5223,21 +5226,21 @@ static void scanner_do_redetect (Scanner* self) {
 	_notify_unref0 (_tmp66_);
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (devices);
-#line 5226 "scanner.c"
+#line 5229 "scanner.c"
 }
 
 
 static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max, SANE_Option_Descriptor* option, gint value) {
 	gint result = 0;
-	gint _tmp0_;
-	gint v;
-	SANE_Option_Descriptor* _tmp1_;
-	SANE_Value_Type _tmp2_;
-	gint _tmp3_;
+	gint v = 0;
+	gint _tmp0_ = 0;
+	SANE_Option_Descriptor* _tmp1_ = NULL;
+	SANE_Value_Type _tmp2_ = 0;
+	gint _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
-	SANE_Option_Descriptor* _tmp5_;
-	SANE_Constraint_Type _tmp6_;
-	gboolean _tmp13_;
+	SANE_Option_Descriptor* _tmp5_ = NULL;
+	SANE_Constraint_Type _tmp6_ = 0;
+	gboolean _tmp13_ = FALSE;
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, 0);
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5260,13 +5263,13 @@ 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 5263 "scanner.c"
-		SANE_Option_Descriptor* _tmp7_;
-		SANE_Range* _tmp8_;
-		SANE_Word _tmp9_;
-		SANE_Option_Descriptor* _tmp10_;
-		SANE_Range* _tmp11_;
-		SANE_Word _tmp12_;
+#line 5266 "scanner.c"
+		SANE_Option_Descriptor* _tmp7_ = NULL;
+		SANE_Range* _tmp8_ = NULL;
+		SANE_Word _tmp9_ = {0};
+		SANE_Option_Descriptor* _tmp10_ = NULL;
+		SANE_Range* _tmp11_ = NULL;
+		SANE_Word _tmp12_ = {0};
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = option;
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5281,43 +5284,43 @@ 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 5284 "scanner.c"
+#line 5287 "scanner.c"
 	} else {
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = FALSE;
-#line 5288 "scanner.c"
+#line 5291 "scanner.c"
 	}
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = _tmp4_;
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp13_) {
-#line 5294 "scanner.c"
-		gint _tmp14_;
-		gint _tmp15_;
-		gint _tmp16_;
-		SANE_Option_Descriptor* _tmp17_;
-		SANE_Range* _tmp18_;
-		SANE_Word _tmp19_;
-		SANE_Option_Descriptor* _tmp20_;
-		SANE_Range* _tmp21_;
-		SANE_Word _tmp22_;
-		gint _tmp23_;
-		gint _tmp24_;
-		gint _tmp25_;
-		gint _tmp26_;
-		SANE_Option_Descriptor* _tmp27_;
-		SANE_Range* _tmp28_;
-		SANE_Word _tmp29_;
-		gint _tmp30_;
-		gint _tmp31_;
-		gint _tmp32_;
-		gint _tmp33_;
-		SANE_Option_Descriptor* _tmp34_;
-		SANE_Range* _tmp35_;
-		SANE_Word _tmp36_;
-		SANE_Option_Descriptor* _tmp37_;
-		SANE_Range* _tmp38_;
-		SANE_Word _tmp39_;
+#line 5297 "scanner.c"
+		gint _tmp14_ = 0;
+		gint _tmp15_ = 0;
+		gint _tmp16_ = 0;
+		SANE_Option_Descriptor* _tmp17_ = NULL;
+		SANE_Range* _tmp18_ = NULL;
+		SANE_Word _tmp19_ = {0};
+		SANE_Option_Descriptor* _tmp20_ = NULL;
+		SANE_Range* _tmp21_ = NULL;
+		SANE_Word _tmp22_ = {0};
+		gint _tmp23_ = 0;
+		gint _tmp24_ = 0;
+		gint _tmp25_ = 0;
+		gint _tmp26_ = 0;
+		SANE_Option_Descriptor* _tmp27_ = NULL;
+		SANE_Range* _tmp28_ = NULL;
+		SANE_Word _tmp29_ = {0};
+		gint _tmp30_ = 0;
+		gint _tmp31_ = 0;
+		gint _tmp32_ = 0;
+		gint _tmp33_ = 0;
+		SANE_Option_Descriptor* _tmp34_ = NULL;
+		SANE_Range* _tmp35_ = NULL;
+		SANE_Word _tmp36_ = {0};
+		SANE_Option_Descriptor* _tmp37_ = NULL;
+		SANE_Range* _tmp38_ = NULL;
+		SANE_Word _tmp39_ = {0};
 #line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = v;
 #line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5381,30 +5384,30 @@ 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]", _tmp30_, _tmp31_, _tmp32_, _tmp33_, (gint) _tmp36_, (gint) _tmp39_);
-#line 5383 "scanner.c"
+#line 5386 "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 5389 "scanner.c"
+#line 5392 "scanner.c"
 }
 
 
 static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index) {
 	gboolean result = FALSE;
-	SANE_Option_Descriptor* _tmp0_;
-	SANE_Int _tmp1_;
-	SANE_Handle _tmp2_;
-	SANE_Int _tmp3_;
+	SANE_Option_Descriptor* _tmp0_ = NULL;
+	SANE_Int _tmp1_ = {0};
+	SANE_Status status = 0;
+	SANE_Handle _tmp2_ = {0};
+	SANE_Int _tmp3_ = {0};
 	SANE_Status _tmp4_ = 0;
-	SANE_Status status;
-	SANE_Int _tmp5_;
-	SANE_Status _tmp6_;
+	SANE_Int _tmp5_ = {0};
+	SANE_Status _tmp6_ = 0;
 	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_;
-	SANE_Status _tmp9_;
-	SANE_Status _tmp14_;
+	gchar* _tmp8_ = NULL;
+	SANE_Status _tmp9_ = 0;
+	SANE_Status _tmp14_ = 0;
 #line 404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
 #line 404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5419,7 +5422,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 5421 "scanner.c"
+#line 5424 "scanner.c"
 	}
 #line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = handle;
@@ -5445,10 +5448,10 @@ 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 5447 "scanner.c"
-		SANE_Option_Descriptor* _tmp10_;
-		const gchar* _tmp11_;
-		SANE_Status _tmp12_;
+#line 5450 "scanner.c"
+		SANE_Option_Descriptor* _tmp10_ = NULL;
+		const gchar* _tmp11_ = NULL;
+		SANE_Status _tmp12_ = 0;
 		const gchar* _tmp13_ = NULL;
 #line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = option;
@@ -5460,7 +5463,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 5462 "scanner.c"
+#line 5465 "scanner.c"
 	}
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = status;
@@ -5468,31 +5471,31 @@ 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 5470 "scanner.c"
+#line 5473 "scanner.c"
 }
 
 
 static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gboolean value, gboolean* _result_) {
 	gboolean _vala_result = FALSE;
-	SANE_Option_Descriptor* _tmp0_;
-	SANE_Value_Type _tmp1_;
-	gboolean _tmp2_;
-	SANE_Bool v;
-	SANE_Handle _tmp3_;
-	SANE_Int _tmp4_;
+	SANE_Option_Descriptor* _tmp0_ = NULL;
+	SANE_Value_Type _tmp1_ = 0;
+	SANE_Bool v = {0};
+	gboolean _tmp2_ = FALSE;
+	SANE_Status status = 0;
+	SANE_Handle _tmp3_ = {0};
+	SANE_Int _tmp4_ = {0};
 	SANE_Status _tmp5_ = 0;
-	SANE_Status status;
-	SANE_Bool _tmp6_;
+	SANE_Bool _tmp6_ = {0};
 	const gchar* _tmp7_ = NULL;
-	gboolean _tmp8_;
+	gboolean _tmp8_ = FALSE;
 	const gchar* _tmp9_ = NULL;
-	gboolean _tmp10_;
-	SANE_Int _tmp11_;
-	const gchar* _tmp12_;
-	SANE_Status _tmp13_;
+	gboolean _tmp10_ = FALSE;
+	SANE_Int _tmp11_ = {0};
+	const gchar* _tmp12_ = NULL;
+	SANE_Status _tmp13_ = 0;
 	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_;
-	const gchar* _tmp16_;
+	gchar* _tmp15_ = NULL;
+	const gchar* _tmp16_ = NULL;
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5525,11 +5528,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 5527 "scanner.c"
+#line 5530 "scanner.c"
 	} else {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = "SANE_FALSE";
-#line 5531 "scanner.c"
+#line 5534 "scanner.c"
 	}
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = _vala_result;
@@ -5537,11 +5540,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 5539 "scanner.c"
+#line 5542 "scanner.c"
 	} else {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = "SANE_FALSE";
-#line 5543 "scanner.c"
+#line 5546 "scanner.c"
 	}
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = option_index;
@@ -5564,29 +5567,29 @@ 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 5565 "scanner.c"
+#line 5568 "scanner.c"
 	}
 }
 
 
 static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gint value, gint* _result_) {
 	gint _vala_result = 0;
-	SANE_Option_Descriptor* _tmp0_;
-	SANE_Value_Type _tmp1_;
-	gint _tmp2_;
-	SANE_Int v;
-	SANE_Option_Descriptor* _tmp3_;
-	SANE_Constraint_Type _tmp4_;
-	SANE_Handle _tmp49_;
-	SANE_Int _tmp50_;
+	SANE_Option_Descriptor* _tmp0_ = NULL;
+	SANE_Value_Type _tmp1_ = 0;
+	SANE_Int v = {0};
+	gint _tmp2_ = 0;
+	SANE_Option_Descriptor* _tmp3_ = NULL;
+	SANE_Constraint_Type _tmp4_ = 0;
+	SANE_Status status = 0;
+	SANE_Handle _tmp49_ = {0};
+	SANE_Int _tmp50_ = {0};
 	SANE_Status _tmp51_ = 0;
-	SANE_Status status;
-	SANE_Int _tmp52_;
-	gint _tmp53_;
+	SANE_Int _tmp52_ = {0};
+	gint _tmp53_ = 0;
 	gchar* _tmp54_ = NULL;
-	gchar* _tmp55_;
-	SANE_Int _tmp56_;
-	SANE_Int _tmp57_;
+	gchar* _tmp55_ = NULL;
+	SANE_Int _tmp56_ = {0};
+	SANE_Int _tmp57_ = {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"
@@ -5607,18 +5610,18 @@ 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 5608 "scanner.c"
-		SANE_Option_Descriptor* _tmp5_;
-		SANE_Range* _tmp6_;
-		SANE_Word _tmp7_;
-		SANE_Int _tmp12_;
-		SANE_Option_Descriptor* _tmp13_;
-		SANE_Range* _tmp14_;
-		SANE_Word _tmp15_;
-		SANE_Int _tmp19_;
-		SANE_Option_Descriptor* _tmp20_;
-		SANE_Range* _tmp21_;
-		SANE_Word _tmp22_;
+#line 5611 "scanner.c"
+		SANE_Option_Descriptor* _tmp5_ = NULL;
+		SANE_Range* _tmp6_ = NULL;
+		SANE_Word _tmp7_ = {0};
+		SANE_Int _tmp12_ = {0};
+		SANE_Option_Descriptor* _tmp13_ = NULL;
+		SANE_Range* _tmp14_ = NULL;
+		SANE_Word _tmp15_ = {0};
+		SANE_Int _tmp19_ = {0};
+		SANE_Option_Descriptor* _tmp20_ = NULL;
+		SANE_Range* _tmp21_ = NULL;
+		SANE_Word _tmp22_ = {0};
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = option;
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5627,11 +5630,11 @@ 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 5628 "scanner.c"
-			SANE_Int _tmp8_;
-			SANE_Option_Descriptor* _tmp9_;
-			SANE_Range* _tmp10_;
-			SANE_Word _tmp11_;
+#line 5631 "scanner.c"
+			SANE_Int _tmp8_ = {0};
+			SANE_Option_Descriptor* _tmp9_ = NULL;
+			SANE_Range* _tmp10_ = NULL;
+			SANE_Word _tmp11_ = {0};
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp8_ = v;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5642,7 +5645,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 5643 "scanner.c"
+#line 5646 "scanner.c"
 		}
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = v;
@@ -5654,10 +5657,10 @@ 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 5655 "scanner.c"
-			SANE_Option_Descriptor* _tmp16_;
-			SANE_Range* _tmp17_;
-			SANE_Word _tmp18_;
+#line 5658 "scanner.c"
+			SANE_Option_Descriptor* _tmp16_ = NULL;
+			SANE_Range* _tmp17_ = NULL;
+			SANE_Word _tmp18_ = {0};
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp16_ = option;
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5666,7 +5669,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 5667 "scanner.c"
+#line 5670 "scanner.c"
 		}
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = v;
@@ -5678,10 +5681,10 @@ 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 5679 "scanner.c"
-			SANE_Option_Descriptor* _tmp23_;
-			SANE_Range* _tmp24_;
-			SANE_Word _tmp25_;
+#line 5682 "scanner.c"
+			SANE_Option_Descriptor* _tmp23_ = NULL;
+			SANE_Range* _tmp24_ = NULL;
+			SANE_Word _tmp25_ = {0};
 #line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = option;
 #line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5690,71 +5693,71 @@ 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 5691 "scanner.c"
+#line 5694 "scanner.c"
 		}
 	} else {
-		SANE_Option_Descriptor* _tmp26_;
-		SANE_Constraint_Type _tmp27_;
+		SANE_Option_Descriptor* _tmp26_ = NULL;
+		SANE_Constraint_Type _tmp27_ = 0;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp26_ = option;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp27_ = _tmp26_->constraint_type;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp27_ == SANE_CONSTRAINT_WORD_LIST) {
-#line 5702 "scanner.c"
-			gint _tmp28_;
-			gint distance;
-			gint nearest;
-			gint _tmp48_;
+#line 5705 "scanner.c"
+			gint distance = 0;
+			gint _tmp28_ = 0;
+			gint nearest = 0;
+			gint _tmp48_ = 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_;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0;
-#line 5713 "scanner.c"
+#line 5716 "scanner.c"
 			{
-				gint i;
+				gint i = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 5718 "scanner.c"
+#line 5721 "scanner.c"
 				{
-					gboolean _tmp29_;
+					gboolean _tmp29_ = FALSE;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp29_ = TRUE;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 5725 "scanner.c"
-						gboolean _tmp30_;
-						gint _tmp32_;
-						SANE_Option_Descriptor* _tmp33_;
-						SANE_Word* _tmp34_;
-						gint _tmp34__length1;
-						SANE_Word _tmp35_;
-						SANE_Option_Descriptor* _tmp36_;
-						SANE_Word* _tmp37_;
-						gint _tmp37__length1;
-						gint _tmp38_;
-						SANE_Word _tmp39_;
-						gint x;
-						gint _tmp40_;
-						SANE_Int _tmp41_;
-						gint d;
-						gint _tmp42_;
+#line 5728 "scanner.c"
+						gboolean _tmp30_ = FALSE;
+						gint _tmp32_ = 0;
+						SANE_Option_Descriptor* _tmp33_ = NULL;
+						SANE_Word* _tmp34_ = NULL;
+						gint _tmp34__length1 = 0;
+						SANE_Word _tmp35_ = {0};
+						gint x = 0;
+						SANE_Option_Descriptor* _tmp36_ = NULL;
+						SANE_Word* _tmp37_ = NULL;
+						gint _tmp37__length1 = 0;
+						gint _tmp38_ = 0;
+						SANE_Word _tmp39_ = {0};
+						gint d = 0;
+						gint _tmp40_ = 0;
+						SANE_Int _tmp41_ = {0};
+						gint _tmp42_ = 0;
 						gint _tmp43_ = 0;
-						gint _tmp44_;
-						gint _tmp45_;
+						gint _tmp44_ = 0;
+						gint _tmp45_ = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp30_ = _tmp29_;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp30_) {
-#line 5749 "scanner.c"
-							gint _tmp31_;
+#line 5752 "scanner.c"
+							gint _tmp31_ = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp31_ = i;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp31_ + 1;
-#line 5755 "scanner.c"
+#line 5758 "scanner.c"
 						}
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp29_ = FALSE;
@@ -5772,7 +5775,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 						if (!(((SANE_Word) _tmp32_) < _tmp35_)) {
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 5773 "scanner.c"
+#line 5776 "scanner.c"
 						}
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp36_ = option;
@@ -5804,9 +5807,9 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 						_tmp45_ = distance;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp44_ < _tmp45_) {
-#line 5805 "scanner.c"
-							gint _tmp46_;
-							gint _tmp47_;
+#line 5808 "scanner.c"
+							gint _tmp46_ = 0;
+							gint _tmp47_ = 0;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp46_ = d;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5815,7 +5818,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 							_tmp47_ = x;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							nearest = _tmp47_;
-#line 5816 "scanner.c"
+#line 5819 "scanner.c"
 						}
 					}
 				}
@@ -5824,7 +5827,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp48_ = nearest;
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp48_;
-#line 5825 "scanner.c"
+#line 5828 "scanner.c"
 		}
 	}
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5858,30 +5861,30 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 	if (_result_) {
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 5858 "scanner.c"
+#line 5861 "scanner.c"
 	}
 }
 
 
 static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gdouble value, gdouble* _result_) {
 	gdouble _vala_result = 0.0;
-	gdouble _tmp0_;
-	gdouble v;
+	gdouble v = 0.0;
+	gdouble _tmp0_ = 0.0;
 	SANE_Fixed v_fixed = {0};
-	SANE_Option_Descriptor* _tmp1_;
-	SANE_Value_Type _tmp2_;
-	SANE_Option_Descriptor* _tmp3_;
-	SANE_Constraint_Type _tmp4_;
-	gdouble _tmp43_;
+	SANE_Option_Descriptor* _tmp1_ = NULL;
+	SANE_Value_Type _tmp2_ = 0;
+	SANE_Option_Descriptor* _tmp3_ = NULL;
+	SANE_Constraint_Type _tmp4_ = 0;
+	gdouble _tmp43_ = 0.0;
 	SANE_Fixed _tmp44_ = {0};
-	SANE_Handle _tmp45_;
-	SANE_Int _tmp46_;
+	SANE_Status status = 0;
+	SANE_Handle _tmp45_ = {0};
+	SANE_Int _tmp46_ = {0};
 	SANE_Status _tmp47_ = 0;
-	SANE_Status status;
-	SANE_Int _tmp48_;
-	gdouble _tmp49_;
+	SANE_Int _tmp48_ = {0};
+	gdouble _tmp49_ = 0.0;
 	gchar* _tmp50_ = NULL;
-	gchar* _tmp51_;
+	gchar* _tmp51_ = NULL;
 	gdouble _tmp52_ = 0.0;
 	gdouble _tmp53_ = 0.0;
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5904,21 +5907,21 @@ 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 5904 "scanner.c"
-		SANE_Option_Descriptor* _tmp5_;
-		SANE_Range* _tmp6_;
-		SANE_Word _tmp7_;
+#line 5907 "scanner.c"
+		gdouble min = 0.0;
+		SANE_Option_Descriptor* _tmp5_ = NULL;
+		SANE_Range* _tmp6_ = NULL;
+		SANE_Word _tmp7_ = {0};
 		gdouble _tmp8_ = 0.0;
-		gdouble min;
-		SANE_Option_Descriptor* _tmp9_;
-		SANE_Range* _tmp10_;
-		SANE_Word _tmp11_;
+		gdouble max = 0.0;
+		SANE_Option_Descriptor* _tmp9_ = NULL;
+		SANE_Range* _tmp10_ = NULL;
+		SANE_Word _tmp11_ = {0};
 		gdouble _tmp12_ = 0.0;
-		gdouble max;
-		gdouble _tmp13_;
-		gdouble _tmp14_;
-		gdouble _tmp16_;
-		gdouble _tmp17_;
+		gdouble _tmp13_ = 0.0;
+		gdouble _tmp14_ = 0.0;
+		gdouble _tmp16_ = 0.0;
+		gdouble _tmp17_ = 0.0;
 #line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = option;
 #line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5945,13 +5948,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 5945 "scanner.c"
-			gdouble _tmp15_;
+#line 5948 "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 5951 "scanner.c"
+#line 5954 "scanner.c"
 		}
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = v;
@@ -5959,75 +5962,75 @@ 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 5959 "scanner.c"
-			gdouble _tmp18_;
+#line 5962 "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 5965 "scanner.c"
+#line 5968 "scanner.c"
 		}
 	} else {
-		SANE_Option_Descriptor* _tmp19_;
-		SANE_Constraint_Type _tmp20_;
+		SANE_Option_Descriptor* _tmp19_ = NULL;
+		SANE_Constraint_Type _tmp20_ = 0;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = option;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp20_ = _tmp19_->constraint_type;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ == SANE_CONSTRAINT_WORD_LIST) {
-#line 5976 "scanner.c"
-			gdouble _tmp21_;
-			gdouble distance;
-			gdouble nearest;
-			gdouble _tmp42_;
+#line 5979 "scanner.c"
+			gdouble distance = 0.0;
+			gdouble _tmp21_ = 0.0;
+			gdouble nearest = 0.0;
+			gdouble _tmp42_ = 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_;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0.0;
-#line 5987 "scanner.c"
+#line 5990 "scanner.c"
 			{
-				gint i;
+				gint i = 0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 5992 "scanner.c"
+#line 5995 "scanner.c"
 				{
-					gboolean _tmp22_;
+					gboolean _tmp22_ = FALSE;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp22_ = TRUE;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 5999 "scanner.c"
-						gboolean _tmp23_;
-						gint _tmp25_;
-						SANE_Option_Descriptor* _tmp26_;
-						SANE_Word* _tmp27_;
-						gint _tmp27__length1;
-						SANE_Word _tmp28_;
-						SANE_Option_Descriptor* _tmp29_;
-						SANE_Word* _tmp30_;
-						gint _tmp30__length1;
-						gint _tmp31_;
-						SANE_Word _tmp32_;
+#line 6002 "scanner.c"
+						gboolean _tmp23_ = FALSE;
+						gint _tmp25_ = 0;
+						SANE_Option_Descriptor* _tmp26_ = NULL;
+						SANE_Word* _tmp27_ = NULL;
+						gint _tmp27__length1 = 0;
+						SANE_Word _tmp28_ = {0};
+						gdouble x = 0.0;
+						SANE_Option_Descriptor* _tmp29_ = NULL;
+						SANE_Word* _tmp30_ = NULL;
+						gint _tmp30__length1 = 0;
+						gint _tmp31_ = 0;
+						SANE_Word _tmp32_ = {0};
 						gdouble _tmp33_ = 0.0;
-						gdouble x;
-						gdouble _tmp34_;
-						gdouble _tmp35_;
+						gdouble _tmp34_ = 0.0;
+						gdouble _tmp35_ = 0.0;
 						gdouble _tmp36_ = 0.0;
-						gdouble _tmp37_;
+						gdouble _tmp37_ = 0.0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp23_ = _tmp22_;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp23_) {
-#line 6021 "scanner.c"
-							gint _tmp24_;
+#line 6024 "scanner.c"
+							gint _tmp24_ = 0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp24_ = i;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp24_ + 1;
-#line 6027 "scanner.c"
+#line 6030 "scanner.c"
 						}
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp22_ = FALSE;
@@ -6045,7 +6048,7 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 						if (!(((SANE_Word) _tmp25_) < _tmp28_)) {
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6045 "scanner.c"
+#line 6048 "scanner.c"
 						}
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp29_ = option;
@@ -6071,11 +6074,11 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 						_tmp37_ = distance;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp36_ < _tmp37_) {
-#line 6071 "scanner.c"
-							gdouble _tmp38_;
-							gdouble _tmp39_;
+#line 6074 "scanner.c"
+							gdouble _tmp38_ = 0.0;
+							gdouble _tmp39_ = 0.0;
 							gdouble _tmp40_ = 0.0;
-							gdouble _tmp41_;
+							gdouble _tmp41_ = 0.0;
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp38_ = x;
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -6088,7 +6091,7 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 							_tmp41_ = x;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							nearest = _tmp41_;
-#line 6088 "scanner.c"
+#line 6091 "scanner.c"
 						}
 					}
 				}
@@ -6097,7 +6100,7 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 			_tmp42_ = nearest;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp42_;
-#line 6097 "scanner.c"
+#line 6100 "scanner.c"
 		}
 	}
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -6137,4539 +6140,4659 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 	if (_result_) {
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6136 "scanner.c"
+#line 6139 "scanner.c"
+	}
+}
+
+
+static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gdouble value, gdouble* _result_) {
+	gdouble _vala_result = 0.0;
+	SANE_Option_Descriptor* _tmp0_ = NULL;
+	SANE_Value_Type _tmp1_ = 0;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_return_if_fail (self != NULL);
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_return_if_fail (option != NULL);
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp0_ = option;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp1_ = _tmp0_->type;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp1_ == SANE_TYPE_FIXED) {
+#line 6158 "scanner.c"
+		SANE_Handle _tmp2_ = {0};
+		SANE_Option_Descriptor* _tmp3_ = NULL;
+		SANE_Int _tmp4_ = {0};
+		gdouble _tmp5_ = 0.0;
+		gdouble _tmp6_ = 0.0;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp2_ = handle;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp3_ = option;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp4_ = option_index;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp5_ = value;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		scanner_set_fixed_option (self, _tmp2_, _tmp3_, _tmp4_, _tmp5_, &_tmp6_);
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_vala_result = _tmp6_;
+#line 6176 "scanner.c"
+	} else {
+		SANE_Option_Descriptor* _tmp7_ = NULL;
+		SANE_Value_Type _tmp8_ = 0;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp7_ = option;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp8_ = _tmp7_->type;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp8_ == SANE_TYPE_INT) {
+#line 6186 "scanner.c"
+			gint r = 0;
+			SANE_Handle _tmp9_ = {0};
+			SANE_Option_Descriptor* _tmp10_ = NULL;
+			SANE_Int _tmp11_ = {0};
+			gdouble _tmp12_ = 0.0;
+			gdouble _tmp13_ = 0.0;
+			gint _tmp14_ = 0;
+			gint _tmp15_ = 0;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp9_ = handle;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp10_ = option;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp11_ = option_index;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp12_ = value;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp13_ = round (_tmp12_);
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			scanner_set_int_option (self, _tmp9_, _tmp10_, _tmp11_, (gint) _tmp13_, &_tmp14_);
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			r = _tmp14_;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp15_ = r;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_vala_result = (gdouble) _tmp15_;
+#line 6213 "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 6219 "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 6226 "scanner.c"
+	}
+}
+
+
+static void scanner_set_option_to_max (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index) {
+	SANE_Option_Descriptor* _tmp0_ = NULL;
+	SANE_Constraint_Type _tmp1_ = 0;
+	SANE_Status status = 0;
+	SANE_Handle _tmp2_ = {0};
+	SANE_Int _tmp3_ = {0};
+	SANE_Option_Descriptor* _tmp4_ = NULL;
+	SANE_Range* _tmp5_ = NULL;
+	SANE_Status _tmp6_ = 0;
+	SANE_Int _tmp7_ = {0};
+	SANE_Status _tmp8_ = 0;
+	gchar* _tmp9_ = NULL;
+	gchar* _tmp10_ = NULL;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_return_if_fail (self != NULL);
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_return_if_fail (option != NULL);
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp0_ = option;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp1_ = _tmp0_->constraint_type;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp1_ != SANE_CONSTRAINT_RANGE) {
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		return;
+#line 6256 "scanner.c"
 	}
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp2_ = handle;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp3_ = option_index;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp4_ = option;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp5_ = _tmp4_->constraint.range;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp6_ = sane_control_option (_tmp2_, _tmp3_, SANE_ACTION_SET_VALUE, &_tmp5_->max, NULL);
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	status = _tmp6_;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp7_ = option_index;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp8_ = status;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp9_ = sane_status_to_string (_tmp8_);
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp10_ = _tmp9_;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:530: sane_control_option (%d, SANE_ACTION_SET_VALUE, opti" \
+"on.range.max) -> (%s)", (gint) _tmp7_, _tmp10_);
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_g_free0 (_tmp10_);
+#line 6282 "scanner.c"
 }
 
 
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_;
-	gchar _tmp1_;
-#line 965 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+	glong _tmp0_ = 0L;
+	gchar _tmp1_ = '\0';
+#line 965 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 966 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 966 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 966 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 966 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 966 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 966 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 966 "/usr/share/vala-0.20/vapi/glib-2.0.vapi"
+#line 966 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
 	return result;
-#line 6155 "scanner.c"
+#line 6300 "scanner.c"
 }
 
 
 static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, const gchar* value, gchar** _result_) {
 	gchar* _vala_result = NULL;
 	gboolean result = FALSE;
-	gchar* _tmp0_;
-	SANE_Option_Descriptor* _tmp1_;
-	SANE_Value_Type _tmp2_;
-	SANE_Option_Descriptor* _tmp3_;
-	SANE_Int _tmp4_;
+	gchar* _tmp0_ = NULL;
+	SANE_Option_Descriptor* _tmp1_ = NULL;
+	SANE_Value_Type _tmp2_ = 0;
+	gchar* s = NULL;
+	SANE_Option_Descriptor* _tmp3_ = NULL;
+	SANE_Int _tmp4_ = {0};
 	gchar* _tmp5_ = NULL;
-	gchar* s;
-	gint s_length1;
-	gint _s_size_;
-	gint i;
-	gchar* _tmp23_;
-	gint _tmp23__length1;
-	gint _tmp24_;
-	gchar _tmp25_;
-	SANE_Handle _tmp26_;
-	SANE_Int _tmp27_;
-	gchar* _tmp28_;
-	gint _tmp28__length1;
+	gint s_length1 = 0;
+	gint _s_size_ = 0;
+	gint i = 0;
+	gchar* _tmp23_ = NULL;
+	gint _tmp23__length1 = 0;
+	gint _tmp24_ = 0;
+	gchar _tmp25_ = '\0';
+	SANE_Status status = 0;
+	SANE_Handle _tmp26_ = {0};
+	SANE_Int _tmp27_ = {0};
+	gchar* _tmp28_ = NULL;
+	gint _tmp28__length1 = 0;
 	SANE_Status _tmp29_ = 0;
-	SANE_Status status;
-	gchar* _tmp30_;
-	gint _tmp30__length1;
-	gchar* _tmp31_;
-	SANE_Int _tmp32_;
-	const gchar* _tmp33_;
+	gchar* _tmp30_ = NULL;
+	gint _tmp30__length1 = 0;
+	gchar* _tmp31_ = NULL;
+	SANE_Int _tmp32_ = {0};
+	const gchar* _tmp33_ = NULL;
 	gchar* _tmp34_ = NULL;
-	gchar* _tmp35_;
-	const gchar* _tmp36_;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gchar* _tmp35_ = NULL;
+	const gchar* _tmp36_ = NULL;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, FALSE);
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (value != NULL, FALSE);
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = g_strdup ("");
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_vala_result);
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp0_;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = option;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _tmp1_->type;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp2_ == SANE_TYPE_STRING, FALSE);
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = option;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->size;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = g_new0 (gchar, _tmp4_);
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = _tmp5_;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s_length1 = _tmp4_;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_s_size_ = s_length1;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	i = 0;
-#line 6222 "scanner.c"
+#line 6367 "scanner.c"
 	{
-		gboolean _tmp6_;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		gboolean _tmp6_ = FALSE;
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = TRUE;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		while (TRUE) {
-#line 6229 "scanner.c"
-			gboolean _tmp7_;
+#line 6374 "scanner.c"
+			gboolean _tmp7_ = FALSE;
 			gboolean _tmp9_ = FALSE;
-			gint _tmp10_;
-			SANE_Option_Descriptor* _tmp11_;
-			SANE_Int _tmp12_;
-			gboolean _tmp16_;
-			gchar* _tmp17_;
-			gint _tmp17__length1;
-			gint _tmp18_;
-			const gchar* _tmp19_;
-			gint _tmp20_;
+			gint _tmp10_ = 0;
+			SANE_Option_Descriptor* _tmp11_ = NULL;
+			SANE_Int _tmp12_ = {0};
+			gboolean _tmp16_ = FALSE;
+			gchar* _tmp17_ = NULL;
+			gint _tmp17__length1 = 0;
+			gint _tmp18_ = 0;
+			const gchar* _tmp19_ = NULL;
+			gint _tmp20_ = 0;
 			gchar _tmp21_ = '\0';
-			gchar _tmp22_;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar _tmp22_ = '\0';
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = _tmp6_;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp7_) {
-#line 6247 "scanner.c"
-				gint _tmp8_;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 6392 "scanner.c"
+				gint _tmp8_ = 0;
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = i;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = _tmp8_ + 1;
-#line 6253 "scanner.c"
+#line 6398 "scanner.c"
 			}
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = FALSE;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp10_ = i;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp11_ = option;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp12_ = _tmp11_->size;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (((SANE_Int) _tmp10_) < (_tmp12_ - 1)) {
-#line 6265 "scanner.c"
-				const gchar* _tmp13_;
-				gint _tmp14_;
+#line 6410 "scanner.c"
+				const gchar* _tmp13_ = NULL;
+				gint _tmp14_ = 0;
 				gchar _tmp15_ = '\0';
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13_ = value;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp14_ = i;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp15_ = string_get (_tmp13_, (glong) _tmp14_);
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp9_ = _tmp15_ != '\0';
-#line 6277 "scanner.c"
+#line 6422 "scanner.c"
 			} else {
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp9_ = FALSE;
-#line 6281 "scanner.c"
+#line 6426 "scanner.c"
 			}
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp16_ = _tmp9_;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp16_) {
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 6289 "scanner.c"
+#line 6434 "scanner.c"
 			}
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = s;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17__length1 = s_length1;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = i;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp19_ = value;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = i;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = string_get (_tmp19_, (glong) _tmp20_);
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_[_tmp18_] = _tmp21_;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = _tmp17_[_tmp18_];
-#line 6307 "scanner.c"
+#line 6452 "scanner.c"
 		}
 	}
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = s;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23__length1 = s_length1;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = i;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_[_tmp24_] = '\0';
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = _tmp23_[_tmp24_];
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = handle;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = option_index;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = s;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28__length1 = s_length1;
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = sane_control_option (_tmp26_, _tmp27_, SANE_ACTION_SET_VALUE, _tmp28_, NULL);
-#line 518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp29_;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = s;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30__length1 = s_length1;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = g_strdup ((const gchar*) _tmp30_);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_vala_result);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp31_;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp32_ = option_index;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_ = value;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = sane_status_to_string (status);
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = _tmp34_;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = _vala_result;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:520: sane_control_option (%d, SANE_ACTION_SET_VALUE, \"%s" \
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:546: sane_control_option (%d, SANE_ACTION_SET_VALUE, \"%s" \
 "\") -> (%s, \"%s\")", (gint) _tmp32_, _tmp33_, _tmp35_, _tmp36_);
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp35_);
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = status == SANE_STATUS_GOOD;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = (g_free (s), NULL);
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6364 "scanner.c"
+#line 6509 "scanner.c"
 	} else {
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
-#line 6368 "scanner.c"
+#line 6513 "scanner.c"
 	}
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 6372 "scanner.c"
+#line 6517 "scanner.c"
 }
 
 
 static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handle handle, SANE_Option_Descriptor* option, SANE_Int option_index, gchar** values, int values_length1, gchar** _result_) {
 	gchar* _vala_result = NULL;
 	gboolean result = FALSE;
-	SANE_Option_Descriptor* _tmp0_;
-	SANE_Value_Type _tmp1_;
-	SANE_Option_Descriptor* _tmp2_;
-	SANE_Constraint_Type _tmp3_;
-	gchar* _tmp36_;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	SANE_Option_Descriptor* _tmp0_ = NULL;
+	SANE_Value_Type _tmp1_ = 0;
+	SANE_Option_Descriptor* _tmp2_ = NULL;
+	SANE_Constraint_Type _tmp3_ = 0;
+	gchar* _tmp36_ = NULL;
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, FALSE);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->type;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp1_ == SANE_TYPE_STRING, FALSE);
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = option;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->constraint_type;
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp3_ == SANE_CONSTRAINT_STRING_LIST, FALSE);
-#line 6400 "scanner.c"
+#line 6545 "scanner.c"
 	{
-		gint i;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		gint i = 0;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 6405 "scanner.c"
+#line 6550 "scanner.c"
 		{
-			gboolean _tmp4_;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gboolean _tmp4_ = FALSE;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = TRUE;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 6412 "scanner.c"
-				gboolean _tmp5_;
-				gchar** _tmp7_;
-				gint _tmp7__length1;
-				gint _tmp8_;
-				const gchar* _tmp9_;
-				gint j;
-				SANE_Option_Descriptor* _tmp24_;
-				gchar** _tmp25_;
-				gint _tmp25__length1;
-				gint _tmp26_;
-				const gchar* _tmp27_;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 6557 "scanner.c"
+				gboolean _tmp5_ = FALSE;
+				gchar** _tmp7_ = NULL;
+				gint _tmp7__length1 = 0;
+				gint _tmp8_ = 0;
+				const gchar* _tmp9_ = NULL;
+				gint j = 0;
+				SANE_Option_Descriptor* _tmp24_ = NULL;
+				gchar** _tmp25_ = NULL;
+				gint _tmp25__length1 = 0;
+				gint _tmp26_ = 0;
+				const gchar* _tmp27_ = NULL;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp5_ = _tmp4_;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp5_) {
-#line 6428 "scanner.c"
-					gint _tmp6_;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 6573 "scanner.c"
+					gint _tmp6_ = 0;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp6_ = i;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp6_ + 1;
-#line 6434 "scanner.c"
+#line 6579 "scanner.c"
 				}
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp4_ = FALSE;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = values;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7__length1 = values_length1;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = i;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp9_ = _tmp7_[_tmp8_];
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!(_tmp9_ != NULL)) {
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 6450 "scanner.c"
+#line 6595 "scanner.c"
 				}
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				j = 0;
-#line 6454 "scanner.c"
+#line 6599 "scanner.c"
 				{
-					gboolean _tmp10_;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					gboolean _tmp10_ = FALSE;
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp10_ = TRUE;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 6461 "scanner.c"
-						gboolean _tmp11_;
-						SANE_Option_Descriptor* _tmp13_;
-						gchar** _tmp14_;
-						gint _tmp14__length1;
-						gint _tmp15_;
-						const gchar* _tmp16_;
-						gchar** _tmp17_;
-						gint _tmp17__length1;
-						gint _tmp18_;
-						const gchar* _tmp19_;
-						SANE_Option_Descriptor* _tmp20_;
-						gchar** _tmp21_;
-						gint _tmp21__length1;
-						gint _tmp22_;
-						const gchar* _tmp23_;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 6606 "scanner.c"
+						gboolean _tmp11_ = FALSE;
+						SANE_Option_Descriptor* _tmp13_ = NULL;
+						gchar** _tmp14_ = NULL;
+						gint _tmp14__length1 = 0;
+						gint _tmp15_ = 0;
+						const gchar* _tmp16_ = NULL;
+						gchar** _tmp17_ = NULL;
+						gint _tmp17__length1 = 0;
+						gint _tmp18_ = 0;
+						const gchar* _tmp19_ = NULL;
+						SANE_Option_Descriptor* _tmp20_ = NULL;
+						gchar** _tmp21_ = NULL;
+						gint _tmp21__length1 = 0;
+						gint _tmp22_ = 0;
+						const gchar* _tmp23_ = NULL;
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp11_ = _tmp10_;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp11_) {
-#line 6481 "scanner.c"
-							gint _tmp12_;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 6626 "scanner.c"
+							gint _tmp12_ = 0;
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp12_ = j;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							j = _tmp12_ + 1;
-#line 6487 "scanner.c"
+#line 6632 "scanner.c"
 						}
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp10_ = FALSE;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp13_ = option;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp14_ = _tmp13_->constraint.string_list;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp14__length1 = -1;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp15_ = j;
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp16_ = _tmp14_[_tmp15_];
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(_tmp16_ != NULL)) {
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6505 "scanner.c"
+#line 6650 "scanner.c"
 						}
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp17_ = values;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp17__length1 = values_length1;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp18_ = i;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp19_ = _tmp17_[_tmp18_];
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp20_ = option;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp21_ = _tmp20_->constraint.string_list;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp21__length1 = -1;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp22_ = j;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp23_ = _tmp21_[_tmp22_];
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (g_strcmp0 (_tmp19_, _tmp23_) == 0) {
-#line 536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6529 "scanner.c"
+#line 6674 "scanner.c"
 						}
 					}
 				}
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp24_ = option;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp25_ = _tmp24_->constraint.string_list;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp25__length1 = -1;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp26_ = j;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp27_ = _tmp25_[_tmp26_];
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp27_ != NULL) {
-#line 6545 "scanner.c"
-					SANE_Handle _tmp28_;
-					SANE_Option_Descriptor* _tmp29_;
-					SANE_Int _tmp30_;
-					gchar** _tmp31_;
-					gint _tmp31__length1;
-					gint _tmp32_;
-					const gchar* _tmp33_;
+#line 6690 "scanner.c"
+					SANE_Handle _tmp28_ = {0};
+					SANE_Option_Descriptor* _tmp29_ = NULL;
+					SANE_Int _tmp30_ = {0};
+					gchar** _tmp31_ = NULL;
+					gint _tmp31__length1 = 0;
+					gint _tmp32_ = 0;
+					const gchar* _tmp33_ = NULL;
 					gchar* _tmp34_ = NULL;
 					gboolean _tmp35_ = FALSE;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp28_ = handle;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp29_ = option;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp30_ = option_index;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp31_ = values;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp31__length1 = values_length1;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp32_ = i;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp33_ = _tmp31_[_tmp32_];
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp35_ = scanner_set_string_option (self, _tmp28_, _tmp29_, _tmp30_, _tmp33_, &_tmp34_);
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_g_free0 (_vala_result);
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_vala_result = _tmp34_;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					result = _tmp35_;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (_result_) {
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						*_result_ = _vala_result;
-#line 6581 "scanner.c"
+#line 6726 "scanner.c"
 					} else {
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (_vala_result);
-#line 6585 "scanner.c"
+#line 6730 "scanner.c"
 					}
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
-#line 6589 "scanner.c"
+#line 6734 "scanner.c"
 				}
 			}
 		}
 	}
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = g_strdup ("");
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_vala_result);
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp36_;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = FALSE;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6606 "scanner.c"
+#line 6751 "scanner.c"
 	} else {
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
-#line 6610 "scanner.c"
+#line 6755 "scanner.c"
 	}
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 6614 "scanner.c"
+#line 6759 "scanner.c"
 }
 
 
 static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descriptor* option) {
-	SANE_Int _tmp0_;
+	gchar* s = NULL;
+	SANE_Int _tmp0_ = {0};
 	gchar* _tmp1_ = NULL;
-	gchar* s;
-	SANE_Option_Descriptor* _tmp2_;
-	const gchar* _tmp3_;
-	SANE_Option_Descriptor* _tmp10_;
-	const gchar* _tmp11_;
-	SANE_Option_Descriptor* _tmp18_;
-	SANE_Value_Type _tmp19_;
-	const gchar* _tmp38_;
-	SANE_Option_Descriptor* _tmp39_;
-	SANE_Int _tmp40_;
+	SANE_Option_Descriptor* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	SANE_Option_Descriptor* _tmp10_ = NULL;
+	const gchar* _tmp11_ = NULL;
+	SANE_Option_Descriptor* _tmp18_ = NULL;
+	SANE_Value_Type _tmp19_ = 0;
+	const gchar* _tmp38_ = NULL;
+	SANE_Option_Descriptor* _tmp39_ = NULL;
+	SANE_Int _tmp40_ = {0};
 	gchar* _tmp41_ = NULL;
-	gchar* _tmp42_;
-	gchar* _tmp43_;
-	SANE_Option_Descriptor* _tmp44_;
-	SANE_Unit _tmp45_;
-	SANE_Option_Descriptor* _tmp64_;
-	SANE_Constraint_Type _tmp65_;
-	SANE_Option_Descriptor* _tmp151_;
-	SANE_Int _tmp152_;
-	SANE_Int cap;
-	SANE_Int _tmp153_;
-	const gchar* _tmp214_;
-	SANE_Option_Descriptor* _tmp215_;
-	const gchar* _tmp216_;
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gchar* _tmp42_ = NULL;
+	gchar* _tmp43_ = NULL;
+	SANE_Option_Descriptor* _tmp44_ = NULL;
+	SANE_Unit _tmp45_ = 0;
+	SANE_Option_Descriptor* _tmp64_ = NULL;
+	SANE_Constraint_Type _tmp65_ = 0;
+	SANE_Int cap = {0};
+	SANE_Option_Descriptor* _tmp151_ = NULL;
+	SANE_Int _tmp152_ = {0};
+	SANE_Int _tmp153_ = {0};
+	const gchar* _tmp214_ = NULL;
+	SANE_Option_Descriptor* _tmp215_ = NULL;
+	const gchar* _tmp216_ = NULL;
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = index;
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = g_strdup_printf ("Option %d:", (gint) _tmp0_);
-#line 549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = _tmp1_;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = option;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->name;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp3_, "") != 0) {
-#line 6661 "scanner.c"
-		const gchar* _tmp4_;
-		SANE_Option_Descriptor* _tmp5_;
-		const gchar* _tmp6_;
+#line 6806 "scanner.c"
+		const gchar* _tmp4_ = NULL;
+		SANE_Option_Descriptor* _tmp5_ = NULL;
+		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_;
-		gchar* _tmp9_;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		gchar* _tmp8_ = NULL;
+		gchar* _tmp9_ = NULL;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = s;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = option;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->name;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = g_strdup_printf (" name='%s'", _tmp6_);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = _tmp7_;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = g_strconcat (_tmp4_, _tmp8_, NULL);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (s);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		s = _tmp9_;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp8_);
-#line 6686 "scanner.c"
+#line 6831 "scanner.c"
 	}
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = option;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = _tmp10_->title;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp11_, "") != 0) {
-#line 6694 "scanner.c"
-		const gchar* _tmp12_;
-		SANE_Option_Descriptor* _tmp13_;
-		const gchar* _tmp14_;
+#line 6839 "scanner.c"
+		const gchar* _tmp12_ = NULL;
+		SANE_Option_Descriptor* _tmp13_ = NULL;
+		const gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_;
-		gchar* _tmp17_;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		gchar* _tmp16_ = NULL;
+		gchar* _tmp17_ = NULL;
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = s;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = option;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = _tmp13_->title;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = g_strdup_printf (" title='%s'", _tmp14_);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = _tmp15_;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = g_strconcat (_tmp12_, _tmp16_, NULL);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (s);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		s = _tmp17_;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp16_);
-#line 6719 "scanner.c"
+#line 6864 "scanner.c"
 	}
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = option;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = _tmp18_->type;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp19_) {
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BOOL:
-#line 6729 "scanner.c"
+#line 6874 "scanner.c"
 		{
-			const gchar* _tmp20_;
-			gchar* _tmp21_;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp20_ = NULL;
+			gchar* _tmp21_ = NULL;
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = s;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = g_strconcat (_tmp20_, " type=bool", NULL);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp21_;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6743 "scanner.c"
+#line 6888 "scanner.c"
 		}
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_INT:
-#line 6747 "scanner.c"
+#line 6892 "scanner.c"
 		{
-			const gchar* _tmp22_;
-			gchar* _tmp23_;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp22_ = NULL;
+			gchar* _tmp23_ = NULL;
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = s;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = g_strconcat (_tmp22_, " type=int", NULL);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp23_;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6761 "scanner.c"
+#line 6906 "scanner.c"
 		}
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_FIXED:
-#line 6765 "scanner.c"
+#line 6910 "scanner.c"
 		{
-			const gchar* _tmp24_;
-			gchar* _tmp25_;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp24_ = NULL;
+			gchar* _tmp25_ = NULL;
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp24_ = s;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = g_strconcat (_tmp24_, " type=fixed", NULL);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp25_;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6779 "scanner.c"
+#line 6924 "scanner.c"
 		}
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_STRING:
-#line 6783 "scanner.c"
+#line 6928 "scanner.c"
 		{
-			const gchar* _tmp26_;
-			gchar* _tmp27_;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp26_ = NULL;
+			gchar* _tmp27_ = NULL;
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp26_ = s;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp27_ = g_strconcat (_tmp26_, " type=string", NULL);
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp27_;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6797 "scanner.c"
+#line 6942 "scanner.c"
 		}
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BUTTON:
-#line 6801 "scanner.c"
+#line 6946 "scanner.c"
 		{
-			const gchar* _tmp28_;
-			gchar* _tmp29_;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp28_ = NULL;
+			gchar* _tmp29_ = NULL;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = s;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_ = g_strconcat (_tmp28_, " type=button", NULL);
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp29_;
-#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6815 "scanner.c"
+#line 6960 "scanner.c"
 		}
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_GROUP:
-#line 6819 "scanner.c"
+#line 6964 "scanner.c"
 		{
-			const gchar* _tmp30_;
-			gchar* _tmp31_;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp30_ = NULL;
+			gchar* _tmp31_ = NULL;
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp30_ = s;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp31_ = g_strconcat (_tmp30_, " type=group", NULL);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp31_;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6833 "scanner.c"
+#line 6978 "scanner.c"
 		}
 		default:
 		{
-			const gchar* _tmp32_;
-			SANE_Option_Descriptor* _tmp33_;
-			SANE_Value_Type _tmp34_;
+			const gchar* _tmp32_ = NULL;
+			SANE_Option_Descriptor* _tmp33_ = NULL;
+			SANE_Value_Type _tmp34_ = 0;
 			gchar* _tmp35_ = NULL;
-			gchar* _tmp36_;
-			gchar* _tmp37_;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp36_ = NULL;
+			gchar* _tmp37_ = NULL;
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp32_ = s;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp33_ = option;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp34_ = _tmp33_->type;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp35_ = g_strdup_printf (" type=%d", (gint) _tmp34_);
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp36_ = _tmp35_;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_ = g_strconcat (_tmp32_, _tmp36_, NULL);
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp37_;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp36_);
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6863 "scanner.c"
+#line 7008 "scanner.c"
 		}
 	}
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = s;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = option;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_ = _tmp39_->size;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = g_strdup_printf (" size=%d", (gint) _tmp40_);
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = _tmp41_;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = g_strconcat (_tmp38_, _tmp42_, NULL);
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (s);
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = _tmp43_;
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp42_);
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = option;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp45_ = _tmp44_->unit;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp45_) {
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_NONE:
-#line 6892 "scanner.c"
+#line 7037 "scanner.c"
 		{
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6896 "scanner.c"
+#line 7041 "scanner.c"
 		}
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PIXEL:
-#line 6900 "scanner.c"
+#line 7045 "scanner.c"
 		{
-			const gchar* _tmp46_;
-			gchar* _tmp47_;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp46_ = NULL;
+			gchar* _tmp47_ = NULL;
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp46_ = s;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp47_ = g_strconcat (_tmp46_, " unit=pixels", NULL);
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp47_;
-#line 590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6914 "scanner.c"
+#line 7059 "scanner.c"
 		}
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_BIT:
-#line 6918 "scanner.c"
+#line 7063 "scanner.c"
 		{
-			const gchar* _tmp48_;
-			gchar* _tmp49_;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp48_ = NULL;
+			gchar* _tmp49_ = NULL;
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp48_ = s;
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp49_ = g_strconcat (_tmp48_, " unit=bits", NULL);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp49_;
-#line 593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6932 "scanner.c"
+#line 7077 "scanner.c"
 		}
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MM:
-#line 6936 "scanner.c"
+#line 7081 "scanner.c"
 		{
-			const gchar* _tmp50_;
-			gchar* _tmp51_;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp50_ = NULL;
+			gchar* _tmp51_ = NULL;
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp50_ = s;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_ = g_strconcat (_tmp50_, " unit=mm", NULL);
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp51_;
-#line 596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6950 "scanner.c"
+#line 7095 "scanner.c"
 		}
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_DPI:
-#line 6954 "scanner.c"
+#line 7099 "scanner.c"
 		{
-			const gchar* _tmp52_;
-			gchar* _tmp53_;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp52_ = NULL;
+			gchar* _tmp53_ = NULL;
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp52_ = s;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp53_ = g_strconcat (_tmp52_, " unit=dpi", NULL);
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp53_;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6968 "scanner.c"
+#line 7113 "scanner.c"
 		}
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PERCENT:
-#line 6972 "scanner.c"
+#line 7117 "scanner.c"
 		{
-			const gchar* _tmp54_;
-			gchar* _tmp55_;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp54_ = NULL;
+			gchar* _tmp55_ = NULL;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_ = s;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp55_ = g_strconcat (_tmp54_, " unit=percent", NULL);
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp55_;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6986 "scanner.c"
+#line 7131 "scanner.c"
 		}
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MICROSECOND:
-#line 6990 "scanner.c"
+#line 7135 "scanner.c"
 		{
-			const gchar* _tmp56_;
-			gchar* _tmp57_;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp56_ = NULL;
+			gchar* _tmp57_ = NULL;
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp56_ = s;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp57_ = g_strconcat (_tmp56_, " unit=microseconds", NULL);
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp57_;
-#line 605 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7004 "scanner.c"
+#line 7149 "scanner.c"
 		}
 		default:
 		{
-			const gchar* _tmp58_;
-			SANE_Option_Descriptor* _tmp59_;
-			SANE_Unit _tmp60_;
+			const gchar* _tmp58_ = NULL;
+			SANE_Option_Descriptor* _tmp59_ = NULL;
+			SANE_Unit _tmp60_ = 0;
 			gchar* _tmp61_ = NULL;
-			gchar* _tmp62_;
-			gchar* _tmp63_;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp62_ = NULL;
+			gchar* _tmp63_ = NULL;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp58_ = s;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp59_ = option;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp60_ = _tmp59_->unit;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp61_ = g_strdup_printf (" unit=%d", (gint) _tmp60_);
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp62_ = _tmp61_;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp63_ = g_strconcat (_tmp58_, _tmp62_, NULL);
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp63_;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp62_);
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7034 "scanner.c"
+#line 7179 "scanner.c"
 		}
 	}
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp64_ = option;
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp65_ = _tmp64_->constraint_type;
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp65_) {
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_RANGE:
-#line 7045 "scanner.c"
+#line 7190 "scanner.c"
 		{
-			SANE_Option_Descriptor* _tmp66_;
-			SANE_Value_Type _tmp67_;
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			SANE_Option_Descriptor* _tmp66_ = NULL;
+			SANE_Value_Type _tmp67_ = 0;
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp66_ = option;
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp67_ = _tmp66_->type;
-#line 614 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp67_ == SANE_TYPE_FIXED) {
-#line 7055 "scanner.c"
-				const gchar* _tmp68_;
-				SANE_Option_Descriptor* _tmp69_;
-				SANE_Range* _tmp70_;
-				SANE_Word _tmp71_;
+#line 7200 "scanner.c"
+				const gchar* _tmp68_ = NULL;
+				SANE_Option_Descriptor* _tmp69_ = NULL;
+				SANE_Range* _tmp70_ = NULL;
+				SANE_Word _tmp71_ = {0};
 				gdouble _tmp72_ = 0.0;
-				SANE_Option_Descriptor* _tmp73_;
-				SANE_Range* _tmp74_;
-				SANE_Word _tmp75_;
+				SANE_Option_Descriptor* _tmp73_ = NULL;
+				SANE_Range* _tmp74_ = NULL;
+				SANE_Word _tmp75_ = {0};
 				gdouble _tmp76_ = 0.0;
-				SANE_Option_Descriptor* _tmp77_;
-				SANE_Range* _tmp78_;
-				SANE_Word _tmp79_;
+				SANE_Option_Descriptor* _tmp77_ = NULL;
+				SANE_Range* _tmp78_ = NULL;
+				SANE_Word _tmp79_ = {0};
 				gchar* _tmp80_ = NULL;
-				gchar* _tmp81_;
-				gchar* _tmp82_;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				gchar* _tmp81_ = NULL;
+				gchar* _tmp82_ = NULL;
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp68_ = s;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp69_ = option;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp70_ = _tmp69_->constraint.range;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp71_ = _tmp70_->min;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp72_ = SANE_UNFIX ((SANE_Fixed) _tmp71_);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp73_ = option;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp74_ = _tmp73_->constraint.range;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp75_ = _tmp74_->max;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp76_ = SANE_UNFIX ((SANE_Fixed) _tmp75_);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp77_ = option;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp78_ = _tmp77_->constraint.range;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp79_ = _tmp78_->quant;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp80_ = g_strdup_printf (" min=%f, max=%f, quant=%d", _tmp72_, _tmp76_, (gint) _tmp79_);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp81_ = _tmp80_;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp82_ = g_strconcat (_tmp68_, _tmp81_, NULL);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp82_;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp81_);
-#line 7107 "scanner.c"
+#line 7252 "scanner.c"
 			} else {
-				const gchar* _tmp83_;
-				SANE_Option_Descriptor* _tmp84_;
-				SANE_Range* _tmp85_;
-				SANE_Word _tmp86_;
-				SANE_Option_Descriptor* _tmp87_;
-				SANE_Range* _tmp88_;
-				SANE_Word _tmp89_;
-				SANE_Option_Descriptor* _tmp90_;
-				SANE_Range* _tmp91_;
-				SANE_Word _tmp92_;
+				const gchar* _tmp83_ = NULL;
+				SANE_Option_Descriptor* _tmp84_ = NULL;
+				SANE_Range* _tmp85_ = NULL;
+				SANE_Word _tmp86_ = {0};
+				SANE_Option_Descriptor* _tmp87_ = NULL;
+				SANE_Range* _tmp88_ = NULL;
+				SANE_Word _tmp89_ = {0};
+				SANE_Option_Descriptor* _tmp90_ = NULL;
+				SANE_Range* _tmp91_ = NULL;
+				SANE_Word _tmp92_ = {0};
 				gchar* _tmp93_ = NULL;
-				gchar* _tmp94_;
-				gchar* _tmp95_;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				gchar* _tmp94_ = NULL;
+				gchar* _tmp95_ = NULL;
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp83_ = s;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp84_ = option;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp85_ = _tmp84_->constraint.range;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp86_ = _tmp85_->min;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp87_ = option;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp88_ = _tmp87_->constraint.range;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp89_ = _tmp88_->max;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp90_ = option;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp91_ = _tmp90_->constraint.range;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp92_ = _tmp91_->quant;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp93_ = g_strdup_printf (" min=%d, max=%d, quant=%d", (gint) _tmp86_, (gint) _tmp89_, (gint) _tmp92_);
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp94_ = _tmp93_;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp95_ = g_strconcat (_tmp83_, _tmp94_, NULL);
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp95_;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp94_);
-#line 7154 "scanner.c"
+#line 7299 "scanner.c"
 			}
-#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7158 "scanner.c"
+#line 7303 "scanner.c"
 		}
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_WORD_LIST:
-#line 7162 "scanner.c"
+#line 7307 "scanner.c"
 		{
-			const gchar* _tmp96_;
-			gchar* _tmp97_;
-			const gchar* _tmp127_;
-			gchar* _tmp128_;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp96_ = NULL;
+			gchar* _tmp97_ = NULL;
+			const gchar* _tmp127_ = NULL;
+			gchar* _tmp128_ = NULL;
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp96_ = s;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp97_ = g_strconcat (_tmp96_, " values=[", NULL);
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp97_;
-#line 7176 "scanner.c"
+#line 7321 "scanner.c"
 			{
-				gint i;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				gint i = 0;
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 7181 "scanner.c"
+#line 7326 "scanner.c"
 				{
-					gboolean _tmp98_;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					gboolean _tmp98_ = FALSE;
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp98_ = TRUE;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 7188 "scanner.c"
-						gboolean _tmp99_;
-						gint _tmp101_;
-						SANE_Option_Descriptor* _tmp102_;
-						SANE_Word* _tmp103_;
-						gint _tmp103__length1;
-						SANE_Word _tmp104_;
-						gint _tmp105_;
-						SANE_Option_Descriptor* _tmp108_;
-						SANE_Value_Type _tmp109_;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7333 "scanner.c"
+						gboolean _tmp99_ = FALSE;
+						gint _tmp101_ = 0;
+						SANE_Option_Descriptor* _tmp102_ = NULL;
+						SANE_Word* _tmp103_ = NULL;
+						gint _tmp103__length1 = 0;
+						SANE_Word _tmp104_ = {0};
+						gint _tmp105_ = 0;
+						SANE_Option_Descriptor* _tmp108_ = NULL;
+						SANE_Value_Type _tmp109_ = 0;
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp99_ = _tmp98_;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp99_) {
-#line 7202 "scanner.c"
-							gint _tmp100_;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7347 "scanner.c"
+							gint _tmp100_ = 0;
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp100_ = i;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp100_ + 1;
-#line 7208 "scanner.c"
+#line 7353 "scanner.c"
 						}
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp98_ = FALSE;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp101_ = i;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp102_ = option;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp103_ = _tmp102_->constraint.word_list;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp103__length1 = -1;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp104_ = _tmp103_[0];
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(((SANE_Word) _tmp101_) < _tmp104_)) {
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 7226 "scanner.c"
+#line 7371 "scanner.c"
 						}
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp105_ = i;
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp105_ != 0) {
-#line 7232 "scanner.c"
-							const gchar* _tmp106_;
-							gchar* _tmp107_;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7377 "scanner.c"
+							const gchar* _tmp106_ = NULL;
+							gchar* _tmp107_ = NULL;
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp106_ = s;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp107_ = g_strconcat (_tmp106_, ", ", NULL);
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp107_;
-#line 7243 "scanner.c"
+#line 7388 "scanner.c"
 						}
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp108_ = option;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp109_ = _tmp108_->type;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp109_ == SANE_TYPE_INT) {
-#line 7251 "scanner.c"
-							const gchar* _tmp110_;
-							SANE_Option_Descriptor* _tmp111_;
-							SANE_Word* _tmp112_;
-							gint _tmp112__length1;
-							gint _tmp113_;
-							SANE_Word _tmp114_;
+#line 7396 "scanner.c"
+							const gchar* _tmp110_ = NULL;
+							SANE_Option_Descriptor* _tmp111_ = NULL;
+							SANE_Word* _tmp112_ = NULL;
+							gint _tmp112__length1 = 0;
+							gint _tmp113_ = 0;
+							SANE_Word _tmp114_ = {0};
 							gchar* _tmp115_ = NULL;
-							gchar* _tmp116_;
-							gchar* _tmp117_;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							gchar* _tmp116_ = NULL;
+							gchar* _tmp117_ = NULL;
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp110_ = s;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp111_ = option;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp112_ = _tmp111_->constraint.word_list;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp112__length1 = -1;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp113_ = i;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp114_ = _tmp112_[_tmp113_ + 1];
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp115_ = g_strdup_printf ("%d", (gint) _tmp114_);
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp116_ = _tmp115_;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp117_ = g_strconcat (_tmp110_, _tmp116_, NULL);
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp117_;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (_tmp116_);
-#line 7285 "scanner.c"
+#line 7430 "scanner.c"
 						} else {
-							const gchar* _tmp118_;
-							SANE_Option_Descriptor* _tmp119_;
-							SANE_Word* _tmp120_;
-							gint _tmp120__length1;
-							gint _tmp121_;
-							SANE_Word _tmp122_;
+							const gchar* _tmp118_ = NULL;
+							SANE_Option_Descriptor* _tmp119_ = NULL;
+							SANE_Word* _tmp120_ = NULL;
+							gint _tmp120__length1 = 0;
+							gint _tmp121_ = 0;
+							SANE_Word _tmp122_ = {0};
 							gdouble _tmp123_ = 0.0;
 							gchar* _tmp124_ = NULL;
-							gchar* _tmp125_;
-							gchar* _tmp126_;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							gchar* _tmp125_ = NULL;
+							gchar* _tmp126_ = NULL;
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp118_ = s;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp119_ = option;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp120_ = _tmp119_->constraint.word_list;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp120__length1 = -1;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp121_ = i;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp122_ = _tmp120_[_tmp121_ + 1];
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp123_ = SANE_UNFIX ((SANE_Fixed) _tmp122_);
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp124_ = g_strdup_printf ("%f", _tmp123_);
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp125_ = _tmp124_;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp126_ = g_strconcat (_tmp118_, _tmp125_, NULL);
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp126_;
-#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (_tmp125_);
-#line 7323 "scanner.c"
+#line 7468 "scanner.c"
 						}
 					}
 				}
 			}
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp127_ = s;
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp128_ = g_strconcat (_tmp127_, "]", NULL);
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp128_;
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7338 "scanner.c"
+#line 7483 "scanner.c"
 		}
-#line 611 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_STRING_LIST:
-#line 7342 "scanner.c"
+#line 7487 "scanner.c"
 		{
-			const gchar* _tmp129_;
-			gchar* _tmp130_;
-			const gchar* _tmp149_;
-			gchar* _tmp150_;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			const gchar* _tmp129_ = NULL;
+			gchar* _tmp130_ = NULL;
+			const gchar* _tmp149_ = NULL;
+			gchar* _tmp150_ = NULL;
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp129_ = s;
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp130_ = g_strconcat (_tmp129_, " values=[", NULL);
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp130_;
-#line 7356 "scanner.c"
+#line 7501 "scanner.c"
 			{
-				gint i;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				gint i = 0;
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 7361 "scanner.c"
+#line 7506 "scanner.c"
 				{
-					gboolean _tmp131_;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					gboolean _tmp131_ = FALSE;
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp131_ = TRUE;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 7368 "scanner.c"
-						gboolean _tmp132_;
-						SANE_Option_Descriptor* _tmp134_;
-						gchar** _tmp135_;
-						gint _tmp135__length1;
-						gint _tmp136_;
-						const gchar* _tmp137_;
-						gint _tmp138_;
-						const gchar* _tmp141_;
-						SANE_Option_Descriptor* _tmp142_;
-						gchar** _tmp143_;
-						gint _tmp143__length1;
-						gint _tmp144_;
-						const gchar* _tmp145_;
+#line 7513 "scanner.c"
+						gboolean _tmp132_ = FALSE;
+						SANE_Option_Descriptor* _tmp134_ = NULL;
+						gchar** _tmp135_ = NULL;
+						gint _tmp135__length1 = 0;
+						gint _tmp136_ = 0;
+						const gchar* _tmp137_ = NULL;
+						gint _tmp138_ = 0;
+						const gchar* _tmp141_ = NULL;
+						SANE_Option_Descriptor* _tmp142_ = NULL;
+						gchar** _tmp143_ = NULL;
+						gint _tmp143__length1 = 0;
+						gint _tmp144_ = 0;
+						const gchar* _tmp145_ = NULL;
 						gchar* _tmp146_ = NULL;
-						gchar* _tmp147_;
-						gchar* _tmp148_;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						gchar* _tmp147_ = NULL;
+						gchar* _tmp148_ = NULL;
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp132_ = _tmp131_;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp132_) {
-#line 7389 "scanner.c"
-							gint _tmp133_;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7534 "scanner.c"
+							gint _tmp133_ = 0;
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp133_ = i;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp133_ + 1;
-#line 7395 "scanner.c"
+#line 7540 "scanner.c"
 						}
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp131_ = FALSE;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp134_ = option;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp135_ = _tmp134_->constraint.string_list;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp135__length1 = -1;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp136_ = i;
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp137_ = _tmp135_[_tmp136_];
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(_tmp137_ != NULL)) {
-#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 7413 "scanner.c"
+#line 7558 "scanner.c"
 						}
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp138_ = i;
-#line 636 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp138_ != 0) {
-#line 7419 "scanner.c"
-							const gchar* _tmp139_;
-							gchar* _tmp140_;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7564 "scanner.c"
+							const gchar* _tmp139_ = NULL;
+							gchar* _tmp140_ = NULL;
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp139_ = s;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp140_ = g_strconcat (_tmp139_, ", ", NULL);
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp140_;
-#line 7430 "scanner.c"
+#line 7575 "scanner.c"
 						}
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp141_ = s;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp142_ = option;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp143_ = _tmp142_->constraint.string_list;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp143__length1 = -1;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp144_ = i;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp145_ = _tmp143_[_tmp144_];
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp146_ = g_strdup_printf ("\"%s\"", _tmp145_);
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp147_ = _tmp146_;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp148_ = g_strconcat (_tmp141_, _tmp147_, NULL);
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (s);
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						s = _tmp148_;
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (_tmp147_);
-#line 7456 "scanner.c"
+#line 7601 "scanner.c"
 					}
 				}
 			}
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp149_ = s;
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp150_ = g_strconcat (_tmp149_, "]", NULL);
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp150_;
-#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7470 "scanner.c"
+#line 7615 "scanner.c"
 		}
 		default:
 		{
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7476 "scanner.c"
+#line 7621 "scanner.c"
 		}
 	}
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp151_ = option;
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp152_ = _tmp151_->cap;
-#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	cap = _tmp152_;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp153_ = cap;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp153_ != ((SANE_Int) 0)) {
-#line 7489 "scanner.c"
-		const gchar* _tmp154_;
-		gchar* _tmp155_;
-		SANE_Int _tmp156_;
-		SANE_Int _tmp163_;
-		SANE_Int _tmp170_;
-		SANE_Int _tmp177_;
-		SANE_Int _tmp184_;
-		SANE_Int _tmp191_;
-		SANE_Int _tmp198_;
-		SANE_Int _tmp205_;
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7634 "scanner.c"
+		const gchar* _tmp154_ = NULL;
+		gchar* _tmp155_ = NULL;
+		SANE_Int _tmp156_ = {0};
+		SANE_Int _tmp163_ = {0};
+		SANE_Int _tmp170_ = {0};
+		SANE_Int _tmp177_ = {0};
+		SANE_Int _tmp184_ = {0};
+		SANE_Int _tmp191_ = {0};
+		SANE_Int _tmp198_ = {0};
+		SANE_Int _tmp205_ = {0};
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp154_ = s;
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp155_ = g_strconcat (_tmp154_, " cap=", NULL);
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (s);
-#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		s = _tmp155_;
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp156_ = cap;
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp156_ & SANE_CAP_SOFT_SELECT) != ((SANE_Int) 0)) {
-#line 7512 "scanner.c"
-			const gchar* _tmp157_;
-			const gchar* _tmp160_;
-			gchar* _tmp161_;
-			SANE_Int _tmp162_;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7657 "scanner.c"
+			const gchar* _tmp157_ = NULL;
+			const gchar* _tmp160_ = NULL;
+			gchar* _tmp161_ = NULL;
+			SANE_Int _tmp162_ = {0};
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp157_ = s;
-#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp157_, "") != 0) {
-#line 7521 "scanner.c"
-				const gchar* _tmp158_;
-				gchar* _tmp159_;
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7666 "scanner.c"
+				const gchar* _tmp158_ = NULL;
+				gchar* _tmp159_ = NULL;
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp158_ = s;
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp159_ = g_strconcat (_tmp158_, ",", NULL);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp159_;
-#line 7532 "scanner.c"
+#line 7677 "scanner.c"
 			}
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp160_ = s;
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp161_ = g_strconcat (_tmp160_, "soft-select", NULL);
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp161_;
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp162_ = cap;
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp162_ & (~SANE_CAP_SOFT_SELECT);
-#line 7546 "scanner.c"
+#line 7691 "scanner.c"
 		}
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp163_ = cap;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp163_ & SANE_CAP_HARD_SELECT) != ((SANE_Int) 0)) {
-#line 7552 "scanner.c"
-			const gchar* _tmp164_;
-			const gchar* _tmp167_;
-			gchar* _tmp168_;
-			SANE_Int _tmp169_;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7697 "scanner.c"
+			const gchar* _tmp164_ = NULL;
+			const gchar* _tmp167_ = NULL;
+			gchar* _tmp168_ = NULL;
+			SANE_Int _tmp169_ = {0};
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp164_ = s;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp164_, "") != 0) {
-#line 7561 "scanner.c"
-				const gchar* _tmp165_;
-				gchar* _tmp166_;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7706 "scanner.c"
+				const gchar* _tmp165_ = NULL;
+				gchar* _tmp166_ = NULL;
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp165_ = s;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp166_ = g_strconcat (_tmp165_, ",", NULL);
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp166_;
-#line 7572 "scanner.c"
+#line 7717 "scanner.c"
 			}
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp167_ = s;
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp168_ = g_strconcat (_tmp167_, "hard-select", NULL);
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 661 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp168_;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp169_ = cap;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp169_ & (~SANE_CAP_HARD_SELECT);
-#line 7586 "scanner.c"
+#line 7731 "scanner.c"
 		}
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp170_ = cap;
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp170_ & SANE_CAP_SOFT_DETECT) != ((SANE_Int) 0)) {
-#line 7592 "scanner.c"
-			const gchar* _tmp171_;
-			const gchar* _tmp174_;
-			gchar* _tmp175_;
-			SANE_Int _tmp176_;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7737 "scanner.c"
+			const gchar* _tmp171_ = NULL;
+			const gchar* _tmp174_ = NULL;
+			gchar* _tmp175_ = NULL;
+			SANE_Int _tmp176_ = {0};
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp171_ = s;
-#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp171_, "") != 0) {
-#line 7601 "scanner.c"
-				const gchar* _tmp172_;
-				gchar* _tmp173_;
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7746 "scanner.c"
+				const gchar* _tmp172_ = NULL;
+				gchar* _tmp173_ = NULL;
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp172_ = s;
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp173_ = g_strconcat (_tmp172_, ",", NULL);
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp173_;
-#line 7612 "scanner.c"
+#line 7757 "scanner.c"
 			}
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp174_ = s;
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp175_ = g_strconcat (_tmp174_, "soft-detect", NULL);
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp175_;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp176_ = cap;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp176_ & (~SANE_CAP_SOFT_DETECT);
-#line 7626 "scanner.c"
+#line 7771 "scanner.c"
 		}
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp177_ = cap;
-#line 671 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp177_ & SANE_CAP_EMULATED) != ((SANE_Int) 0)) {
-#line 7632 "scanner.c"
-			const gchar* _tmp178_;
-			const gchar* _tmp181_;
-			gchar* _tmp182_;
-			SANE_Int _tmp183_;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7777 "scanner.c"
+			const gchar* _tmp178_ = NULL;
+			const gchar* _tmp181_ = NULL;
+			gchar* _tmp182_ = NULL;
+			SANE_Int _tmp183_ = {0};
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp178_ = s;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp178_, "") != 0) {
-#line 7641 "scanner.c"
-				const gchar* _tmp179_;
-				gchar* _tmp180_;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7786 "scanner.c"
+				const gchar* _tmp179_ = NULL;
+				gchar* _tmp180_ = NULL;
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp179_ = s;
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp180_ = g_strconcat (_tmp179_, ",", NULL);
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 674 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp180_;
-#line 7652 "scanner.c"
+#line 7797 "scanner.c"
 			}
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp181_ = s;
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp182_ = g_strconcat (_tmp181_, "emulated", NULL);
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp182_;
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp183_ = cap;
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp183_ & (~SANE_CAP_EMULATED);
-#line 7666 "scanner.c"
+#line 7811 "scanner.c"
 		}
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp184_ = cap;
-#line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp184_ & SANE_CAP_AUTOMATIC) != ((SANE_Int) 0)) {
-#line 7672 "scanner.c"
-			const gchar* _tmp185_;
-			const gchar* _tmp188_;
-			gchar* _tmp189_;
-			SANE_Int _tmp190_;
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7817 "scanner.c"
+			const gchar* _tmp185_ = NULL;
+			const gchar* _tmp188_ = NULL;
+			gchar* _tmp189_ = NULL;
+			SANE_Int _tmp190_ = {0};
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp185_ = s;
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp185_, "") != 0) {
-#line 7681 "scanner.c"
-				const gchar* _tmp186_;
-				gchar* _tmp187_;
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7826 "scanner.c"
+				const gchar* _tmp186_ = NULL;
+				gchar* _tmp187_ = NULL;
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp186_ = s;
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp187_ = g_strconcat (_tmp186_, ",", NULL);
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp187_;
-#line 7692 "scanner.c"
+#line 7837 "scanner.c"
 			}
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_ = s;
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp189_ = g_strconcat (_tmp188_, "automatic", NULL);
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp189_;
-#line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp190_ = cap;
-#line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp190_ & (~SANE_CAP_AUTOMATIC);
-#line 7706 "scanner.c"
+#line 7851 "scanner.c"
 		}
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp191_ = cap;
-#line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp191_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
-#line 7712 "scanner.c"
-			const gchar* _tmp192_;
-			const gchar* _tmp195_;
-			gchar* _tmp196_;
-			SANE_Int _tmp197_;
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7857 "scanner.c"
+			const gchar* _tmp192_ = NULL;
+			const gchar* _tmp195_ = NULL;
+			gchar* _tmp196_ = NULL;
+			SANE_Int _tmp197_ = {0};
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp192_ = s;
-#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp192_, "") != 0) {
-#line 7721 "scanner.c"
-				const gchar* _tmp193_;
-				gchar* _tmp194_;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7866 "scanner.c"
+				const gchar* _tmp193_ = NULL;
+				gchar* _tmp194_ = NULL;
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp193_ = s;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp194_ = g_strconcat (_tmp193_, ",", NULL);
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp194_;
-#line 7732 "scanner.c"
+#line 7877 "scanner.c"
 			}
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp195_ = s;
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp196_ = g_strconcat (_tmp195_, "inactive", NULL);
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 689 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp196_;
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp197_ = cap;
-#line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp197_ & (~SANE_CAP_INACTIVE);
-#line 7746 "scanner.c"
+#line 7891 "scanner.c"
 		}
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp198_ = cap;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp198_ & SANE_CAP_ADVANCED) != ((SANE_Int) 0)) {
-#line 7752 "scanner.c"
-			const gchar* _tmp199_;
-			const gchar* _tmp202_;
-			gchar* _tmp203_;
-			SANE_Int _tmp204_;
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7897 "scanner.c"
+			const gchar* _tmp199_ = NULL;
+			const gchar* _tmp202_ = NULL;
+			gchar* _tmp203_ = NULL;
+			SANE_Int _tmp204_ = {0};
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp199_ = s;
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp199_, "") != 0) {
-#line 7761 "scanner.c"
-				const gchar* _tmp200_;
-				gchar* _tmp201_;
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7906 "scanner.c"
+				const gchar* _tmp200_ = NULL;
+				gchar* _tmp201_ = NULL;
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp200_ = s;
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp201_ = g_strconcat (_tmp200_, ",", NULL);
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp201_;
-#line 7772 "scanner.c"
+#line 7917 "scanner.c"
 			}
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp202_ = s;
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp203_ = g_strconcat (_tmp202_, "advanced", NULL);
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 696 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp203_;
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp204_ = cap;
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp204_ & (~SANE_CAP_ADVANCED);
-#line 7786 "scanner.c"
+#line 7931 "scanner.c"
 		}
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp205_ = cap;
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp205_ != ((SANE_Int) 0)) {
-#line 7792 "scanner.c"
-			const gchar* _tmp206_;
-			const gchar* _tmp209_;
-			SANE_Int _tmp210_;
+#line 7937 "scanner.c"
+			const gchar* _tmp206_ = NULL;
+			const gchar* _tmp209_ = NULL;
+			SANE_Int _tmp210_ = {0};
 			gchar* _tmp211_ = NULL;
-			gchar* _tmp212_;
-			gchar* _tmp213_;
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp212_ = NULL;
+			gchar* _tmp213_ = NULL;
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp206_ = s;
-#line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp206_, "") != 0) {
-#line 7803 "scanner.c"
-				const gchar* _tmp207_;
-				gchar* _tmp208_;
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7948 "scanner.c"
+				const gchar* _tmp207_ = NULL;
+				gchar* _tmp208_ = NULL;
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp207_ = s;
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp208_ = g_strconcat (_tmp207_, ",", NULL);
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp208_;
-#line 7814 "scanner.c"
+#line 7959 "scanner.c"
 			}
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp209_ = s;
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp210_ = cap;
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp211_ = g_strdup_printf ("%x", (guint) ((gint) _tmp210_));
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp212_ = _tmp211_;
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp213_ = g_strconcat (_tmp209_, _tmp212_, NULL);
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp213_;
-#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp212_);
-#line 7832 "scanner.c"
+#line 7977 "scanner.c"
 		}
 	}
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp214_ = s;
-#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:708: %s", _tmp214_);
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:734: %s", _tmp214_);
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp215_ = option;
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp216_ = _tmp215_->desc;
-#line 710 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp216_ != NULL) {
-#line 7845 "scanner.c"
-		SANE_Option_Descriptor* _tmp217_;
-		const gchar* _tmp218_;
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 7990 "scanner.c"
+		SANE_Option_Descriptor* _tmp217_ = NULL;
+		const gchar* _tmp218_ = NULL;
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp217_ = option;
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp218_ = _tmp217_->desc;
-#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:711:   Description: %s", _tmp218_);
-#line 7854 "scanner.c"
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:737:   Description: %s", _tmp218_);
+#line 7999 "scanner.c"
 	}
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (s);
-#line 7858 "scanner.c"
+#line 8003 "scanner.c"
 }
 
 
 static void scanner_authorization_cb (const gchar* resource, gchar* username, int username_length1, gchar* password, int password_length1) {
-	Scanner* _tmp0_;
-	const gchar* _tmp1_;
-	NotifyRequestAuthorization* _tmp2_;
-	NotifyRequestAuthorization* _tmp3_;
-	Scanner* _tmp4_;
-	GAsyncQueue* _tmp5_;
+	Scanner* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	NotifyRequestAuthorization* _tmp2_ = NULL;
+	NotifyRequestAuthorization* _tmp3_ = NULL;
+	Credentials* credentials = NULL;
+	Scanner* _tmp4_ = NULL;
+	GAsyncQueue* _tmp5_ = NULL;
 	gpointer _tmp6_ = NULL;
-	Credentials* credentials;
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (resource != NULL);
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner_scanner_object;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = resource;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = notify_request_authorization_new (_tmp1_);
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_;
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (_tmp0_, (Notify*) _tmp3_);
-#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp3_);
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = scanner_scanner_object;
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_->priv->authorize_queue;
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = g_async_queue_pop (_tmp5_);
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials = (Credentials*) _tmp6_;
-#line 7893 "scanner.c"
+#line 8038 "scanner.c"
 	{
-		gint i;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		gint i = 0;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 7898 "scanner.c"
+#line 8043 "scanner.c"
 		{
-			gboolean _tmp7_;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gboolean _tmp7_ = FALSE;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = TRUE;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 7905 "scanner.c"
-				gboolean _tmp8_;
+#line 8050 "scanner.c"
+				gboolean _tmp8_ = FALSE;
 				gboolean _tmp10_ = FALSE;
-				Credentials* _tmp11_;
-				const gchar* _tmp12_;
-				gint _tmp13_;
+				Credentials* _tmp11_ = NULL;
+				const gchar* _tmp12_ = NULL;
+				gint _tmp13_ = 0;
 				gchar _tmp14_ = '\0';
-				gboolean _tmp17_;
-				gchar* _tmp18_;
-				gint _tmp18__length1;
-				gint _tmp19_;
-				Credentials* _tmp20_;
-				const gchar* _tmp21_;
-				gint _tmp22_;
+				gboolean _tmp17_ = FALSE;
+				gchar* _tmp18_ = NULL;
+				gint _tmp18__length1 = 0;
+				gint _tmp19_ = 0;
+				Credentials* _tmp20_ = NULL;
+				const gchar* _tmp21_ = NULL;
+				gint _tmp22_ = 0;
 				gchar _tmp23_ = '\0';
-				gchar _tmp24_;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				gchar _tmp24_ = '\0';
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = _tmp7_;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp8_) {
-#line 7925 "scanner.c"
-					gint _tmp9_;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8070 "scanner.c"
+					gint _tmp9_ = 0;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = i;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp9_ + 1;
-#line 7931 "scanner.c"
+#line 8076 "scanner.c"
 				}
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = FALSE;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp11_ = credentials;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp12_ = _tmp11_->username;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13_ = i;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp14_ = string_get (_tmp12_, (glong) _tmp13_);
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp14_ != '\0') {
-#line 7945 "scanner.c"
-					gint _tmp15_;
-					gint _tmp16_;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8090 "scanner.c"
+					gint _tmp15_ = 0;
+					gint _tmp16_ = 0;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp15_ = i;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp16_ = SANE_MAX_USERNAME_LEN;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp10_ = _tmp15_ < _tmp16_;
-#line 7954 "scanner.c"
+#line 8099 "scanner.c"
 				} else {
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp10_ = FALSE;
-#line 7958 "scanner.c"
+#line 8103 "scanner.c"
 				}
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp17_ = _tmp10_;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp17_) {
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 7966 "scanner.c"
+#line 8111 "scanner.c"
 				}
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp18_ = username;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp18__length1 = username_length1;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp19_ = i;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp20_ = credentials;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp21_ = _tmp20_->username;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22_ = i;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp23_ = string_get (_tmp21_, (glong) _tmp22_);
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp18_[_tmp19_] = _tmp23_;
-#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp24_ = _tmp18_[_tmp19_];
-#line 7986 "scanner.c"
+#line 8131 "scanner.c"
 			}
 		}
 	}
 	{
-		gint i;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		gint i = 0;
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 7994 "scanner.c"
+#line 8139 "scanner.c"
 		{
-			gboolean _tmp25_;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gboolean _tmp25_ = FALSE;
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = TRUE;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 8001 "scanner.c"
-				gboolean _tmp26_;
+#line 8146 "scanner.c"
+				gboolean _tmp26_ = FALSE;
 				gboolean _tmp28_ = FALSE;
-				Credentials* _tmp29_;
-				const gchar* _tmp30_;
-				gint _tmp31_;
+				Credentials* _tmp29_ = NULL;
+				const gchar* _tmp30_ = NULL;
+				gint _tmp31_ = 0;
 				gchar _tmp32_ = '\0';
-				gboolean _tmp35_;
-				gchar* _tmp36_;
-				gint _tmp36__length1;
-				gint _tmp37_;
-				Credentials* _tmp38_;
-				const gchar* _tmp39_;
-				gint _tmp40_;
+				gboolean _tmp35_ = FALSE;
+				gchar* _tmp36_ = NULL;
+				gint _tmp36__length1 = 0;
+				gint _tmp37_ = 0;
+				Credentials* _tmp38_ = NULL;
+				const gchar* _tmp39_ = NULL;
+				gint _tmp40_ = 0;
 				gchar _tmp41_ = '\0';
-				gchar _tmp42_;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				gchar _tmp42_ = '\0';
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp26_ = _tmp25_;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp26_) {
-#line 8021 "scanner.c"
-					gint _tmp27_;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8166 "scanner.c"
+					gint _tmp27_ = 0;
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp27_ = i;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp27_ + 1;
-#line 8027 "scanner.c"
+#line 8172 "scanner.c"
 				}
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp25_ = FALSE;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp29_ = credentials;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp30_ = _tmp29_->password;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp31_ = i;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32_ = string_get (_tmp30_, (glong) _tmp31_);
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp32_ != '\0') {
-#line 8041 "scanner.c"
-					gint _tmp33_;
-					gint _tmp34_;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8186 "scanner.c"
+					gint _tmp33_ = 0;
+					gint _tmp34_ = 0;
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp33_ = i;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp34_ = SANE_MAX_USERNAME_LEN;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp28_ = _tmp33_ < _tmp34_;
-#line 8050 "scanner.c"
+#line 8195 "scanner.c"
 				} else {
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp28_ = FALSE;
-#line 8054 "scanner.c"
+#line 8199 "scanner.c"
 				}
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp35_ = _tmp28_;
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp35_) {
-#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 8062 "scanner.c"
+#line 8207 "scanner.c"
 				}
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp36_ = password;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp36__length1 = password_length1;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp37_ = i;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp38_ = credentials;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp39_ = _tmp38_->password;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp40_ = i;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp41_ = string_get (_tmp39_, (glong) _tmp40_);
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp36_[_tmp37_] = _tmp41_;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp42_ = _tmp36_[_tmp37_];
-#line 8082 "scanner.c"
+#line 8227 "scanner.c"
 			}
 		}
 	}
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
-#line 8088 "scanner.c"
+#line 8233 "scanner.c"
 }
 
 
 static gpointer _credentials_ref0 (gpointer self) {
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? credentials_ref (self) : NULL;
-#line 8095 "scanner.c"
+#line 8240 "scanner.c"
 }
 
 
 void scanner_authorize (Scanner* self, const gchar* username, const gchar* password) {
-	Credentials* _tmp0_;
-	Credentials* credentials;
-	const gchar* _tmp1_;
-	gchar* _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp4_;
-	GAsyncQueue* _tmp5_;
-	Credentials* _tmp6_;
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	Credentials* credentials = NULL;
+	Credentials* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	GAsyncQueue* _tmp5_ = NULL;
+	Credentials* _tmp6_ = NULL;
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (username != NULL);
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (password != NULL);
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = credentials_new ();
-#line 727 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials = _tmp0_;
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = username;
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (credentials->username);
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials->username = _tmp2_;
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = password;
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (credentials->password);
-#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials->password = _tmp4_;
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->authorize_queue;
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = _credentials_ref0 (credentials);
-#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp5_, _tmp6_);
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
-#line 8142 "scanner.c"
+#line 8287 "scanner.c"
 }
 
 
 static void scanner_close_device (Scanner* self) {
-	gboolean _tmp0_;
-#line 733 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gboolean _tmp0_ = FALSE;
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->have_handle;
-#line 735 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 8154 "scanner.c"
-		SANE_Handle _tmp1_;
-		SANE_Handle _tmp2_;
-#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8299 "scanner.c"
+		SANE_Handle _tmp1_ = {0};
+		SANE_Handle _tmp2_ = {0};
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = self->priv->handle;
-#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		sane_cancel (_tmp1_);
-#line 738 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:738: sane_cancel ()");
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 764 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:764: sane_cancel ()");
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = self->priv->handle;
-#line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		sane_close (_tmp2_);
-#line 741 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:741: sane_close ()");
-#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:767: sane_close ()");
+#line 768 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->have_handle = FALSE;
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_hash_table_unref0 (self->priv->options);
-#line 743 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->options = NULL;
-#line 8175 "scanner.c"
+#line 8320 "scanner.c"
 	}
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = NULL;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer_length1 = 0;
-#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->_buffer_size_ = self->priv->buffer_length1;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_job_unref0_0 (self->priv->job_queue);
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_queue = NULL;
-#line 749 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 775 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
-#line 8191 "scanner.c"
+#line 8336 "scanner.c"
 }
 
 
 static void scanner_fail_scan (Scanner* self, gint error_code, const gchar* error_string) {
-	gint _tmp0_;
-	const gchar* _tmp1_;
-	NotifyScanFailed* _tmp2_;
-	NotifyScanFailed* _tmp3_;
-#line 752 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gint _tmp0_ = 0;
+	const gchar* _tmp1_ = NULL;
+	NotifyScanFailed* _tmp2_ = NULL;
+	NotifyScanFailed* _tmp3_ = NULL;
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 752 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (error_string != NULL);
-#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 780 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_close_device (self);
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = error_code;
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = error_string;
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = notify_scan_failed_new (_tmp0_, _tmp1_);
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_;
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp3_);
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp3_);
-#line 8220 "scanner.c"
+#line 8365 "scanner.c"
 }
 
 
 static gpointer _request_ref0 (gpointer self) {
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? request_ref (self) : NULL;
-#line 8227 "scanner.c"
+#line 8372 "scanner.c"
 }
 
 
 static gpointer _scan_job_ref0 (gpointer self) {
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_job_ref (self) : NULL;
-#line 8234 "scanner.c"
+#line 8379 "scanner.c"
 }
 
 
 static gboolean scanner_handle_requests (Scanner* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	ScanState _tmp1_;
-	gboolean _tmp3_;
-	gint request_count;
-#line 759 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	ScanState _tmp1_ = 0;
+	gboolean _tmp3_ = FALSE;
+	gint request_count = 0;
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->state;
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SCAN_STATE_IDLE) {
-#line 8250 "scanner.c"
-		gboolean _tmp2_;
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8395 "scanner.c"
+		gboolean _tmp2_ = FALSE;
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = self->priv->need_redetect;
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
-#line 8256 "scanner.c"
+#line 8401 "scanner.c"
 	} else {
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 8260 "scanner.c"
+#line 8405 "scanner.c"
 	}
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp0_;
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp3_) {
-#line 763 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_REDETECT;
-#line 8268 "scanner.c"
+#line 8413 "scanner.c"
 	}
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_count = 0;
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
-#line 8274 "scanner.c"
+#line 8419 "scanner.c"
 		Request* request = NULL;
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
-		ScanState _tmp6_;
-		gboolean _tmp8_;
-		gboolean _tmp11_;
-		gint _tmp14_;
-		Request* _tmp15_;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		ScanState _tmp6_ = 0;
+		gboolean _tmp8_ = FALSE;
+		gboolean _tmp11_ = FALSE;
+		gint _tmp14_ = 0;
+		Request* _tmp15_ = NULL;
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = self->priv->state;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp6_ == SCAN_STATE_IDLE) {
-#line 8287 "scanner.c"
-			gint _tmp7_;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8432 "scanner.c"
+			gint _tmp7_ = 0;
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = request_count;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = _tmp7_ == 0;
-#line 8293 "scanner.c"
+#line 8438 "scanner.c"
 		} else {
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = FALSE;
-#line 8297 "scanner.c"
+#line 8442 "scanner.c"
 		}
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = _tmp5_;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp8_) {
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = TRUE;
-#line 8305 "scanner.c"
+#line 8450 "scanner.c"
 		} else {
-			GAsyncQueue* _tmp9_;
+			GAsyncQueue* _tmp9_ = NULL;
 			gint _tmp10_ = 0;
-#line 771 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp9_ = self->priv->request_queue;
-#line 771 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp10_ = g_async_queue_length (_tmp9_);
-#line 771 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = _tmp10_ > 0;
-#line 8315 "scanner.c"
+#line 8460 "scanner.c"
 		}
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = _tmp4_;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp11_) {
-#line 8321 "scanner.c"
-			GAsyncQueue* _tmp12_;
+#line 8466 "scanner.c"
+			GAsyncQueue* _tmp12_ = NULL;
 			gpointer _tmp13_ = NULL;
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp12_ = self->priv->request_queue;
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp13_ = g_async_queue_pop (_tmp12_);
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (request);
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			request = (Request*) _tmp13_;
-#line 8332 "scanner.c"
+#line 8477 "scanner.c"
 		} else {
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = TRUE;
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (request);
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 8340 "scanner.c"
+#line 8485 "scanner.c"
 		}
-#line 776 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:776: Processing request");
-#line 777 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 802 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:802: Processing request");
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = request_count;
-#line 777 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_count = _tmp14_ + 1;
-#line 779 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = request;
-#line 779 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_REQUEST_START_SCAN)) {
-#line 8352 "scanner.c"
-			Request* _tmp16_;
-			RequestStartScan* _tmp17_;
-			RequestStartScan* r;
-			RequestStartScan* _tmp18_;
-			ScanJob* _tmp19_;
-			ScanJob* _tmp20_;
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8497 "scanner.c"
+			RequestStartScan* r = NULL;
+			Request* _tmp16_ = NULL;
+			RequestStartScan* _tmp17_ = NULL;
+			RequestStartScan* _tmp18_ = NULL;
+			ScanJob* _tmp19_ = NULL;
+			ScanJob* _tmp20_ = NULL;
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp16_ = request;
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = _request_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_REQUEST_START_SCAN, RequestStartScan));
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			r = _tmp17_;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = r;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp19_ = _tmp18_->job;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = _scan_job_ref0 (_tmp19_);
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			self->priv->job_queue = g_list_append (self->priv->job_queue, _tmp20_);
-#line 779 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (r);
-#line 8375 "scanner.c"
+#line 8520 "scanner.c"
 		} else {
-			Request* _tmp21_;
-#line 784 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			Request* _tmp21_ = NULL;
+#line 810 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = request;
-#line 784 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 810 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_REQUEST_CANCEL)) {
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_fail_scan (self, (gint) SANE_STATUS_CANCELLED, "Scan cancelled - do not report this error");
-#line 8384 "scanner.c"
+#line 8529 "scanner.c"
 			} else {
-				Request* _tmp22_;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				Request* _tmp22_ = NULL;
+#line 814 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22_ = request;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 814 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_REQUEST_QUIT)) {
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 816 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_close_device (self);
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					result = FALSE;
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_request_unref0 (request);
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
-#line 8399 "scanner.c"
+#line 8544 "scanner.c"
 				}
 			}
 		}
-#line 767 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_request_unref0 (request);
-#line 8405 "scanner.c"
+#line 8550 "scanner.c"
 	}
 }
 
 
 static void _g_free0_ (gpointer var) {
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	var = (g_free (var), NULL);
-#line 8413 "scanner.c"
+#line 8558 "scanner.c"
 }
 
 
 static void scanner_do_open (Scanner* self) {
-	GList* _tmp0_;
-	gconstpointer _tmp1_;
-	ScanJob* _tmp2_;
-	ScanJob* job;
+	ScanJob* job = NULL;
+	GList* _tmp0_ = NULL;
+	gconstpointer _tmp1_ = NULL;
+	ScanJob* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-	ScanJob* _tmp4_;
-	const gchar* _tmp5_;
-	gboolean _tmp7_;
-	ScanJob* _tmp11_;
-	const gchar* _tmp12_;
-	gboolean _tmp14_;
-	GHashFunc _tmp19_;
-	GEqualFunc _tmp20_;
-	GHashTable* _tmp21_;
-	ScanJob* _tmp22_;
-	const gchar* _tmp23_;
+	ScanJob* _tmp4_ = NULL;
+	const gchar* _tmp5_ = NULL;
+	gboolean _tmp7_ = FALSE;
+	ScanJob* _tmp11_ = NULL;
+	const gchar* _tmp12_ = NULL;
+	gboolean _tmp14_ = FALSE;
+	GHashFunc _tmp19_ = NULL;
+	GEqualFunc _tmp20_ = NULL;
+	GHashTable* _tmp21_ = NULL;
+	SANE_Status status = 0;
+	ScanJob* _tmp22_ = NULL;
+	const gchar* _tmp23_ = NULL;
 	SANE_Handle _tmp24_ = {0};
 	SANE_Status _tmp25_ = 0;
-	SANE_Status status;
-	ScanJob* _tmp26_;
-	const gchar* _tmp27_;
-	SANE_Status _tmp28_;
+	ScanJob* _tmp26_ = NULL;
+	const gchar* _tmp27_ = NULL;
+	SANE_Status _tmp28_ = 0;
 	gchar* _tmp29_ = NULL;
-	gchar* _tmp30_;
-	SANE_Status _tmp31_;
-	ScanJob* _tmp36_;
-	const gchar* _tmp37_;
-	gchar* _tmp38_;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gchar* _tmp30_ = NULL;
+	SANE_Status _tmp31_ = 0;
+	ScanJob* _tmp36_ = NULL;
+	const gchar* _tmp37_ = NULL;
+	gchar* _tmp38_ = NULL;
+#line 822 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 826 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->line_count = 0;
-#line 801 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 827 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->pass_number = 0;
-#line 802 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->page_number = 0;
-#line 803 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->notified_page = -1;
-#line 804 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 830 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->option_index = (SANE_Int) 0;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = job;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_->device;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ == NULL) {
-#line 8472 "scanner.c"
-		const gchar* _tmp6_;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8617 "scanner.c"
+		const gchar* _tmp6_ = NULL;
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = self->priv->default_device;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = _tmp6_ != NULL;
-#line 8478 "scanner.c"
+#line 8623 "scanner.c"
 	} else {
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = FALSE;
-#line 8482 "scanner.c"
+#line 8627 "scanner.c"
 	}
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = _tmp3_;
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp7_) {
-#line 8488 "scanner.c"
-		ScanJob* _tmp8_;
-		const gchar* _tmp9_;
-		gchar* _tmp10_;
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8633 "scanner.c"
+		ScanJob* _tmp8_ = NULL;
+		const gchar* _tmp9_ = NULL;
+		gchar* _tmp10_ = NULL;
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = job;
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->default_device;
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = g_strdup (_tmp9_);
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp8_->device);
-#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_->device = _tmp10_;
-#line 8502 "scanner.c"
+#line 8647 "scanner.c"
 	}
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = job;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = _tmp11_->device;
-#line 809 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp12_ == NULL) {
-#line 8510 "scanner.c"
+#line 8655 "scanner.c"
 		const gchar* _tmp13_ = NULL;
-#line 811 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:811: No scan device available");
-#line 812 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:837: No scan device available");
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = _ ("No scanners available.  Please connect a scanner.");
-#line 812 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, 0, _tmp13_);
-#line 815 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 815 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 8522 "scanner.c"
+#line 8667 "scanner.c"
 	}
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = self->priv->have_handle;
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp14_) {
-#line 8528 "scanner.c"
-		const gchar* _tmp15_;
-		ScanJob* _tmp16_;
-		const gchar* _tmp17_;
-		SANE_Handle _tmp18_;
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 8673 "scanner.c"
+		const gchar* _tmp15_ = NULL;
+		ScanJob* _tmp16_ = NULL;
+		const gchar* _tmp17_ = NULL;
+		SANE_Handle _tmp18_ = {0};
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = self->priv->current_device;
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = job;
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = _tmp16_->device;
-#line 821 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (g_strcmp0 (_tmp15_, _tmp17_) == 0) {
-#line 823 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			self->priv->state = SCAN_STATE_GET_OPTION;
-#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_scan_job_unref0 (job);
-#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return;
-#line 8547 "scanner.c"
+#line 8692 "scanner.c"
 		}
-#line 827 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp18_ = self->priv->handle;
-#line 827 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		sane_close (_tmp18_);
-#line 828 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:828: sane_close ()");
-#line 829 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 854 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_debug ("scanner.vala:854: sane_close ()");
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->have_handle = FALSE;
-#line 8557 "scanner.c"
+#line 8702 "scanner.c"
 	}
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->current_device = NULL;
-#line 834 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->have_handle = FALSE;
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = g_str_hash;
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = g_str_equal;
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = g_hash_table_new_full (_tmp19_, _tmp20_, _g_free0_, NULL);
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_hash_table_unref0 (self->priv->options);
-#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->options = _tmp21_;
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = job;
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = _tmp22_->device;
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = sane_open (_tmp23_, &_tmp24_);
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->handle = _tmp24_;
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp25_;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = job;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = _tmp26_->device;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = status;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = sane_status_to_string (_tmp28_);
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = _tmp29_;
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:837: sane_open (\"%s\") -> %s", _tmp27_, _tmp30_);
-#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:863: sane_open (\"%s\") -> %s", _tmp27_, _tmp30_);
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp30_);
-#line 839 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = status;
-#line 839 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp31_ != SANE_STATUS_GOOD) {
-#line 8603 "scanner.c"
-		SANE_Status _tmp32_;
+#line 8748 "scanner.c"
+		SANE_Status _tmp32_ = 0;
 		const gchar* _tmp33_ = NULL;
-		SANE_Status _tmp34_;
+		SANE_Status _tmp34_ = 0;
 		const gchar* _tmp35_ = NULL;
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp32_ = status;
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp33_ = sane_strstatus (_tmp32_);
-#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:841: Unable to get open device: %s", _tmp33_);
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:867: Unable to get open device: %s", _tmp33_);
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = status;
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp35_ = _ ("Unable to connect to scanner");
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp34_, _tmp35_);
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 8624 "scanner.c"
+#line 8769 "scanner.c"
 	}
-#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->have_handle = TRUE;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = job;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_ = _tmp36_->device;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = g_strdup (_tmp37_);
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->current_device = _tmp38_;
-#line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_GET_OPTION;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 822 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 8642 "scanner.c"
+#line 8787 "scanner.c"
 }
 
 
 static void scanner_do_get_option (Scanner* self) {
-	GList* _tmp0_;
-	gconstpointer _tmp1_;
-	ScanJob* _tmp2_;
-	ScanJob* job;
-	SANE_Handle _tmp3_;
-	SANE_Int _tmp4_;
+	ScanJob* job = NULL;
+	GList* _tmp0_ = NULL;
+	gconstpointer _tmp1_ = NULL;
+	ScanJob* _tmp2_ = NULL;
+	SANE_Option_Descriptor* option = NULL;
+	SANE_Handle _tmp3_ = {0};
+	SANE_Int _tmp4_ = {0};
 	SANE_Option_Descriptor* _tmp5_ = NULL;
-	SANE_Option_Descriptor* option;
-	SANE_Int _tmp6_;
-	SANE_Int _tmp7_;
-	SANE_Int index;
-	SANE_Int _tmp8_;
-	SANE_Option_Descriptor* _tmp9_;
-	SANE_Int _tmp373_;
-	SANE_Option_Descriptor* _tmp374_;
-	SANE_Option_Descriptor* _tmp375_;
-	SANE_Value_Type _tmp376_;
-	SANE_Option_Descriptor* _tmp377_;
-	SANE_Int _tmp378_;
-	SANE_Option_Descriptor* _tmp379_;
-	const gchar* _tmp380_;
-	GHashTable* _tmp381_;
-	SANE_Option_Descriptor* _tmp382_;
-	const gchar* _tmp383_;
-	gchar* _tmp384_;
-	SANE_Int _tmp385_;
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	SANE_Int _tmp6_ = {0};
+	SANE_Int index = {0};
+	SANE_Int _tmp7_ = {0};
+	SANE_Int _tmp8_ = {0};
+	SANE_Option_Descriptor* _tmp9_ = NULL;
+	SANE_Int _tmp355_ = {0};
+	SANE_Option_Descriptor* _tmp356_ = NULL;
+	SANE_Option_Descriptor* _tmp357_ = NULL;
+	SANE_Value_Type _tmp358_ = 0;
+	SANE_Option_Descriptor* _tmp359_ = NULL;
+	SANE_Int _tmp360_ = {0};
+	SANE_Option_Descriptor* _tmp361_ = NULL;
+	const gchar* _tmp362_ = NULL;
+	GHashTable* _tmp363_ = NULL;
+	SANE_Option_Descriptor* _tmp364_ = NULL;
+	const gchar* _tmp365_ = NULL;
+	gchar* _tmp366_ = NULL;
+	SANE_Int _tmp367_ = {0};
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = self->priv->handle;
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->option_index;
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = sane_get_option_descriptor (_tmp3_, _tmp4_);
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	option = _tmp5_;
-#line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = self->priv->option_index;
-#line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:858: sane_get_option_descriptor (%d)", (gint) _tmp6_);
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:884: sane_get_option_descriptor (%d)", (gint) _tmp6_);
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = self->priv->option_index;
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	index = _tmp7_;
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = self->priv->option_index;
-#line 860 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->option_index = _tmp8_ + 1;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = option;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ == NULL) {
-#line 8707 "scanner.c"
-		SANE_Handle _tmp10_;
-		const gchar* _tmp11_;
+#line 8852 "scanner.c"
+		SANE_Handle _tmp10_ = {0};
+		const gchar* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
 		SANE_Option_Descriptor* _tmp13_ = NULL;
-		SANE_Option_Descriptor* _tmp14_;
-		SANE_Option_Descriptor* _tmp18_;
-		SANE_Handle _tmp93_;
-		const gchar* _tmp94_;
+		SANE_Option_Descriptor* _tmp14_ = NULL;
+		SANE_Option_Descriptor* _tmp18_ = NULL;
+		SANE_Handle _tmp93_ = {0};
+		const gchar* _tmp94_ = NULL;
 		gint _tmp95_ = 0;
 		SANE_Option_Descriptor* _tmp96_ = NULL;
-		SANE_Option_Descriptor* _tmp97_;
-		SANE_Handle _tmp153_;
+		SANE_Option_Descriptor* _tmp97_ = NULL;
+		SANE_Handle _tmp153_ = {0};
 		gint _tmp154_ = 0;
 		SANE_Option_Descriptor* _tmp155_ = NULL;
-		SANE_Option_Descriptor* _tmp156_;
-		SANE_Handle _tmp164_;
+		SANE_Option_Descriptor* _tmp156_ = NULL;
+		SANE_Handle _tmp164_ = {0};
 		gint _tmp165_ = 0;
 		SANE_Option_Descriptor* _tmp166_ = NULL;
-		SANE_Option_Descriptor* _tmp167_;
-		SANE_Handle _tmp175_;
+		SANE_Option_Descriptor* _tmp167_ = NULL;
+		SANE_Handle _tmp175_ = {0};
 		gint _tmp176_ = 0;
 		SANE_Option_Descriptor* _tmp177_ = NULL;
-		SANE_Option_Descriptor* _tmp178_;
-		SANE_Handle _tmp191_;
-		const gchar* _tmp192_;
+		SANE_Option_Descriptor* _tmp178_ = NULL;
+		SANE_Handle _tmp191_ = {0};
+		const gchar* _tmp192_ = NULL;
 		gint _tmp193_ = 0;
 		SANE_Option_Descriptor* _tmp194_ = NULL;
-		SANE_Option_Descriptor* _tmp195_;
-		SANE_Handle _tmp225_;
-		const gchar* _tmp226_;
-		gint _tmp227_ = 0;
-		SANE_Option_Descriptor* _tmp228_ = NULL;
-		SANE_Option_Descriptor* _tmp229_;
-		SANE_Handle _tmp247_;
-		const gchar* _tmp248_;
-		gint _tmp249_ = 0;
-		SANE_Option_Descriptor* _tmp250_ = NULL;
-		SANE_Option_Descriptor* _tmp251_;
-		SANE_Handle _tmp269_;
-		const gchar* _tmp270_;
-		gint _tmp271_ = 0;
-		SANE_Option_Descriptor* _tmp272_ = NULL;
-		SANE_Option_Descriptor* _tmp273_;
-		SANE_Handle _tmp288_;
-		const gchar* _tmp289_;
-		gint _tmp290_ = 0;
-		SANE_Option_Descriptor* _tmp291_ = NULL;
-		SANE_Option_Descriptor* _tmp292_;
-		SANE_Handle _tmp307_;
-		const gchar* _tmp308_;
-		gint _tmp309_ = 0;
-		SANE_Option_Descriptor* _tmp310_ = NULL;
-		SANE_Option_Descriptor* _tmp311_;
-		SANE_Handle _tmp322_;
-		const gchar* _tmp323_;
-		gint _tmp324_ = 0;
-		SANE_Option_Descriptor* _tmp325_ = NULL;
-		SANE_Option_Descriptor* _tmp326_;
-		const gchar* _tmp337_;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		SANE_Option_Descriptor* _tmp195_ = NULL;
+		SANE_Handle _tmp215_ = {0};
+		const gchar* _tmp216_ = NULL;
+		gint _tmp217_ = 0;
+		SANE_Option_Descriptor* _tmp218_ = NULL;
+		SANE_Option_Descriptor* _tmp219_ = NULL;
+		SANE_Handle _tmp234_ = {0};
+		const gchar* _tmp235_ = NULL;
+		gint _tmp236_ = 0;
+		SANE_Option_Descriptor* _tmp237_ = NULL;
+		SANE_Option_Descriptor* _tmp238_ = NULL;
+		SANE_Handle _tmp253_ = {0};
+		const gchar* _tmp254_ = NULL;
+		gint _tmp255_ = 0;
+		SANE_Option_Descriptor* _tmp256_ = NULL;
+		gboolean _tmp257_ = FALSE;
+		SANE_Option_Descriptor* _tmp258_ = NULL;
+		gboolean _tmp261_ = FALSE;
+		SANE_Handle _tmp271_ = {0};
+		const gchar* _tmp272_ = NULL;
+		gint _tmp273_ = 0;
+		SANE_Option_Descriptor* _tmp274_ = NULL;
+		gboolean _tmp275_ = FALSE;
+		SANE_Option_Descriptor* _tmp276_ = NULL;
+		gboolean _tmp279_ = FALSE;
+		SANE_Handle _tmp289_ = {0};
+		const gchar* _tmp290_ = NULL;
+		gint _tmp291_ = 0;
+		SANE_Option_Descriptor* _tmp292_ = NULL;
+		SANE_Option_Descriptor* _tmp293_ = NULL;
+		SANE_Handle _tmp304_ = {0};
+		const gchar* _tmp305_ = NULL;
+		gint _tmp306_ = 0;
+		SANE_Option_Descriptor* _tmp307_ = NULL;
+		SANE_Option_Descriptor* _tmp308_ = NULL;
+		const gchar* _tmp319_ = NULL;
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = self->priv->handle;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = SANE_NAME_SCAN_SOURCE;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = scanner_get_option_by_name (self, _tmp10_, _tmp11_, &_tmp12_);
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp12_;
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp13_;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = option;
-#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp14_ == NULL) {
-#line 8781 "scanner.c"
-			SANE_Handle _tmp15_;
+#line 8930 "scanner.c"
+			SANE_Handle _tmp15_ = {0};
 			gint _tmp16_ = 0;
 			SANE_Option_Descriptor* _tmp17_ = NULL;
-#line 869 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_debug ("scanner.vala:869: SCAN_SOURCE not available, trying alternative \"doc-" \
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_debug ("scanner.vala:895: SCAN_SOURCE not available, trying alternative \"doc-" \
 "source\"");
-#line 870 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = self->priv->handle;
-#line 870 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = scanner_get_option_by_name (self, _tmp15_, "doc-source", &_tmp16_);
-#line 870 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp16_;
-#line 870 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp17_;
-#line 8795 "scanner.c"
+#line 8944 "scanner.c"
 		}
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp18_ = option;
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp18_ != NULL) {
-#line 8801 "scanner.c"
-			gchar* _tmp19_;
+#line 8950 "scanner.c"
+			gchar** flatbed_sources = NULL;
+			gchar* _tmp19_ = NULL;
 			const gchar* _tmp20_ = NULL;
-			gchar* _tmp21_;
-			gchar* _tmp22_;
+			gchar* _tmp21_ = NULL;
+			gchar* _tmp22_ = NULL;
 			const gchar* _tmp23_ = NULL;
-			gchar* _tmp24_;
-			gchar* _tmp25_;
-			gchar* _tmp26_;
+			gchar* _tmp24_ = NULL;
+			gchar* _tmp25_ = NULL;
+			gchar* _tmp26_ = NULL;
 			const gchar* _tmp27_ = NULL;
-			gchar* _tmp28_;
+			gchar* _tmp28_ = NULL;
 			gchar** _tmp29_ = NULL;
-			gchar** flatbed_sources;
-			gint flatbed_sources_length1;
-			gint _flatbed_sources_size_;
-			gchar* _tmp30_;
+			gint flatbed_sources_length1 = 0;
+			gint _flatbed_sources_size_ = 0;
+			gchar** adf_sources = NULL;
+			gchar* _tmp30_ = NULL;
 			const gchar* _tmp31_ = NULL;
-			gchar* _tmp32_;
-			gchar* _tmp33_;
-			gchar* _tmp34_;
-			gchar* _tmp35_;
-			gchar* _tmp36_;
+			gchar* _tmp32_ = NULL;
+			gchar* _tmp33_ = NULL;
+			gchar* _tmp34_ = NULL;
+			gchar* _tmp35_ = NULL;
+			gchar* _tmp36_ = NULL;
 			gchar** _tmp37_ = NULL;
-			gchar** adf_sources;
-			gint adf_sources_length1;
-			gint _adf_sources_size_;
-			gchar* _tmp38_;
+			gint adf_sources_length1 = 0;
+			gint _adf_sources_size_ = 0;
+			gchar** adf_front_sources = NULL;
+			gchar* _tmp38_ = NULL;
 			const gchar* _tmp39_ = NULL;
-			gchar* _tmp40_;
+			gchar* _tmp40_ = NULL;
 			gchar** _tmp41_ = NULL;
-			gchar** adf_front_sources;
-			gint adf_front_sources_length1;
-			gint _adf_front_sources_size_;
-			gchar* _tmp42_;
+			gint adf_front_sources_length1 = 0;
+			gint _adf_front_sources_size_ = 0;
+			gchar** adf_back_sources = NULL;
+			gchar* _tmp42_ = NULL;
 			const gchar* _tmp43_ = NULL;
-			gchar* _tmp44_;
+			gchar* _tmp44_ = NULL;
 			gchar** _tmp45_ = NULL;
-			gchar** adf_back_sources;
-			gint adf_back_sources_length1;
-			gint _adf_back_sources_size_;
-			gchar* _tmp46_;
+			gint adf_back_sources_length1 = 0;
+			gint _adf_back_sources_size_ = 0;
+			gchar** adf_duplex_sources = NULL;
+			gchar* _tmp46_ = NULL;
 			const gchar* _tmp47_ = NULL;
-			gchar* _tmp48_;
-			gchar* _tmp49_;
-			gchar* _tmp50_;
+			gchar* _tmp48_ = NULL;
+			gchar* _tmp49_ = NULL;
+			gchar* _tmp50_ = NULL;
 			gchar** _tmp51_ = NULL;
-			gchar** adf_duplex_sources;
-			gint adf_duplex_sources_length1;
-			gint _adf_duplex_sources_size_;
-			ScanJob* _tmp52_;
-			ScanType _tmp53_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gint adf_duplex_sources_length1 = 0;
+			gint _adf_duplex_sources_size_ = 0;
+			ScanJob* _tmp52_ = NULL;
+			ScanType _tmp53_ = 0;
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp19_ = g_strdup ("Auto");
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = SANE_I18N ("Auto");
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = g_strdup (_tmp20_);
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = g_strdup ("Flatbed");
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = SANE_I18N ("Flatbed");
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp24_ = g_strdup (_tmp23_);
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = g_strdup ("FlatBed");
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp26_ = g_strdup ("Normal");
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp27_ = SANE_I18N ("Normal");
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = g_strdup (_tmp27_);
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_ = g_new0 (gchar*, 7 + 1);
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[0] = _tmp19_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[1] = _tmp21_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[2] = _tmp22_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[3] = _tmp24_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[4] = _tmp25_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[5] = _tmp26_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[6] = _tmp28_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources = _tmp29_;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources_length1 = 7;
-#line 874 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_flatbed_sources_size_ = flatbed_sources_length1;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp30_ = g_strdup ("Automatic Document Feeder");
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp31_ = SANE_I18N ("Automatic Document Feeder");
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp32_ = g_strdup (_tmp31_);
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp33_ = g_strdup ("ADF");
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp34_ = g_strdup ("Automatic Document Feeder(left aligned)");
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp35_ = g_strdup ("Automatic Document Feeder(centrally aligned)");
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp36_ = g_strdup ("ADF Simplex");
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_ = g_new0 (gchar*, 6 + 1);
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[0] = _tmp30_;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[1] = _tmp32_;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[2] = _tmp33_;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[3] = _tmp34_;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[4] = _tmp35_;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[5] = _tmp36_;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_sources = _tmp37_;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_sources_length1 = 6;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_sources_size_ = adf_sources_length1;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp38_ = g_strdup ("ADF Front");
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp39_ = SANE_I18N ("ADF Front");
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp40_ = g_strdup (_tmp39_);
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp41_ = g_new0 (gchar*, 2 + 1);
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp41_[0] = _tmp38_;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp41_[1] = _tmp40_;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_front_sources = _tmp41_;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_front_sources_length1 = 2;
-#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_front_sources_size_ = adf_front_sources_length1;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp42_ = g_strdup ("ADF Back");
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp43_ = SANE_I18N ("ADF Back");
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp44_ = g_strdup (_tmp43_);
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp45_ = g_new0 (gchar*, 2 + 1);
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp45_[0] = _tmp42_;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp45_[1] = _tmp44_;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_back_sources = _tmp45_;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_back_sources_length1 = 2;
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_back_sources_size_ = adf_back_sources_length1;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp46_ = g_strdup ("ADF Duplex");
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp47_ = SANE_I18N ("ADF Duplex");
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp48_ = g_strdup (_tmp47_);
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp49_ = g_strdup ("ADF Duplex - Long-Edge Binding");
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp50_ = g_strdup ("ADF Duplex - Short-Edge Binding");
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_ = g_new0 (gchar*, 4 + 1);
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_[0] = _tmp46_;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_[1] = _tmp48_;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_[2] = _tmp49_;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_[3] = _tmp50_;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources = _tmp51_;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources_length1 = 4;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_duplex_sources_size_ = adf_duplex_sources_length1;
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp52_ = job;
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp53_ = _tmp52_->type;
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			switch (_tmp53_) {
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_SINGLE:
-#line 8998 "scanner.c"
+#line 9147 "scanner.c"
 				{
-					SANE_Handle _tmp54_;
-					SANE_Option_Descriptor* _tmp55_;
-					SANE_Int _tmp56_;
+					SANE_Handle _tmp54_ = {0};
+					SANE_Option_Descriptor* _tmp55_ = NULL;
+					SANE_Int _tmp56_ = {0};
 					gboolean _tmp57_ = FALSE;
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp54_ = self->priv->handle;
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp55_ = option;
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp56_ = index;
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp57_ = scanner_set_default_option (self, _tmp54_, _tmp55_, _tmp56_);
-#line 918 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp57_) {
-#line 9014 "scanner.c"
-						SANE_Handle _tmp58_;
-						SANE_Option_Descriptor* _tmp59_;
-						SANE_Int _tmp60_;
-						gchar** _tmp61_;
-						gint _tmp61__length1;
+#line 9163 "scanner.c"
+						SANE_Handle _tmp58_ = {0};
+						SANE_Option_Descriptor* _tmp59_ = NULL;
+						SANE_Int _tmp60_ = {0};
+						gchar** _tmp61_ = NULL;
+						gint _tmp61__length1 = 0;
 						gboolean _tmp62_ = FALSE;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp58_ = self->priv->handle;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp59_ = option;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp60_ = index;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp61_ = flatbed_sources;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp61__length1 = flatbed_sources_length1;
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp62_ = scanner_set_constrained_string_option (self, _tmp58_, _tmp59_, _tmp60_, _tmp61_, _tmp61__length1, NULL);
-#line 919 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp62_) {
-#line 920 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							g_warning ("scanner.vala:920: Unable to set single page source, please file a bug");
-#line 9037 "scanner.c"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							g_warning ("scanner.vala:946: Unable to set single page source, please file a bug");
+#line 9186 "scanner.c"
 						}
 					}
-#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9042 "scanner.c"
+#line 9191 "scanner.c"
 				}
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_FRONT:
-#line 9046 "scanner.c"
+#line 9195 "scanner.c"
 				{
-					SANE_Handle _tmp63_;
-					SANE_Option_Descriptor* _tmp64_;
-					SANE_Int _tmp65_;
-					gchar** _tmp66_;
-					gint _tmp66__length1;
+					SANE_Handle _tmp63_ = {0};
+					SANE_Option_Descriptor* _tmp64_ = NULL;
+					SANE_Int _tmp65_ = {0};
+					gchar** _tmp66_ = NULL;
+					gint _tmp66__length1 = 0;
 					gboolean _tmp67_ = FALSE;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp63_ = self->priv->handle;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp64_ = option;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp65_ = index;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp66_ = adf_front_sources;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp66__length1 = adf_front_sources_length1;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp67_ = scanner_set_constrained_string_option (self, _tmp63_, _tmp64_, _tmp65_, _tmp66_, _tmp66__length1, NULL);
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp67_) {
-#line 9068 "scanner.c"
-						SANE_Handle _tmp68_;
-						SANE_Option_Descriptor* _tmp69_;
-						SANE_Int _tmp70_;
-						gchar** _tmp71_;
-						gint _tmp71__length1;
+#line 9217 "scanner.c"
+						SANE_Handle _tmp68_ = {0};
+						SANE_Option_Descriptor* _tmp69_ = NULL;
+						SANE_Int _tmp70_ = {0};
+						gchar** _tmp71_ = NULL;
+						gint _tmp71__length1 = 0;
 						gboolean _tmp72_ = FALSE;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp68_ = self->priv->handle;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp69_ = option;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp70_ = index;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp71_ = adf_sources;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp71__length1 = adf_sources_length1;
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp72_ = scanner_set_constrained_string_option (self, _tmp68_, _tmp69_, _tmp70_, _tmp71_, _tmp71__length1, NULL);
-#line 924 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp72_) {
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							g_warning ("scanner.vala:925: Unable to set front ADF source, please file a bug");
-#line 9091 "scanner.c"
+#line 951 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							g_warning ("scanner.vala:951: Unable to set front ADF source, please file a bug");
+#line 9240 "scanner.c"
 						}
 					}
-#line 926 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9096 "scanner.c"
+#line 9245 "scanner.c"
 				}
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BACK:
-#line 9100 "scanner.c"
+#line 9249 "scanner.c"
 				{
-					SANE_Handle _tmp73_;
-					SANE_Option_Descriptor* _tmp74_;
-					SANE_Int _tmp75_;
-					gchar** _tmp76_;
-					gint _tmp76__length1;
+					SANE_Handle _tmp73_ = {0};
+					SANE_Option_Descriptor* _tmp74_ = NULL;
+					SANE_Int _tmp75_ = {0};
+					gchar** _tmp76_ = NULL;
+					gint _tmp76__length1 = 0;
 					gboolean _tmp77_ = FALSE;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp73_ = self->priv->handle;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp74_ = option;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp75_ = index;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp76_ = adf_back_sources;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp76__length1 = adf_back_sources_length1;
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp77_ = scanner_set_constrained_string_option (self, _tmp73_, _tmp74_, _tmp75_, _tmp76_, _tmp76__length1, NULL);
-#line 928 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp77_) {
-#line 9122 "scanner.c"
-						SANE_Handle _tmp78_;
-						SANE_Option_Descriptor* _tmp79_;
-						SANE_Int _tmp80_;
-						gchar** _tmp81_;
-						gint _tmp81__length1;
+#line 9271 "scanner.c"
+						SANE_Handle _tmp78_ = {0};
+						SANE_Option_Descriptor* _tmp79_ = NULL;
+						SANE_Int _tmp80_ = {0};
+						gchar** _tmp81_ = NULL;
+						gint _tmp81__length1 = 0;
 						gboolean _tmp82_ = FALSE;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp78_ = self->priv->handle;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp79_ = option;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp80_ = index;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp81_ = adf_sources;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp81__length1 = adf_sources_length1;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp82_ = scanner_set_constrained_string_option (self, _tmp78_, _tmp79_, _tmp80_, _tmp81_, _tmp81__length1, NULL);
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp82_) {
-#line 930 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							g_warning ("scanner.vala:930: Unable to set back ADF source, please file a bug");
-#line 9145 "scanner.c"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							g_warning ("scanner.vala:956: Unable to set back ADF source, please file a bug");
+#line 9294 "scanner.c"
 						}
 					}
-#line 931 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9150 "scanner.c"
+#line 9299 "scanner.c"
 				}
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BOTH:
-#line 9154 "scanner.c"
+#line 9303 "scanner.c"
 				{
-					SANE_Handle _tmp83_;
-					SANE_Option_Descriptor* _tmp84_;
-					SANE_Int _tmp85_;
-					gchar** _tmp86_;
-					gint _tmp86__length1;
+					SANE_Handle _tmp83_ = {0};
+					SANE_Option_Descriptor* _tmp84_ = NULL;
+					SANE_Int _tmp85_ = {0};
+					gchar** _tmp86_ = NULL;
+					gint _tmp86__length1 = 0;
 					gboolean _tmp87_ = FALSE;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp83_ = self->priv->handle;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp84_ = option;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp85_ = index;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp86_ = adf_duplex_sources;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp86__length1 = adf_duplex_sources_length1;
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp87_ = scanner_set_constrained_string_option (self, _tmp83_, _tmp84_, _tmp85_, _tmp86_, _tmp86__length1, NULL);
-#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp87_) {
-#line 9176 "scanner.c"
-						SANE_Handle _tmp88_;
-						SANE_Option_Descriptor* _tmp89_;
-						SANE_Int _tmp90_;
-						gchar** _tmp91_;
-						gint _tmp91__length1;
+#line 9325 "scanner.c"
+						SANE_Handle _tmp88_ = {0};
+						SANE_Option_Descriptor* _tmp89_ = NULL;
+						SANE_Int _tmp90_ = {0};
+						gchar** _tmp91_ = NULL;
+						gint _tmp91__length1 = 0;
 						gboolean _tmp92_ = FALSE;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp88_ = self->priv->handle;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp89_ = option;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp90_ = index;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp91_ = adf_sources;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp91__length1 = adf_sources_length1;
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp92_ = scanner_set_constrained_string_option (self, _tmp88_, _tmp89_, _tmp90_, _tmp91_, _tmp91__length1, NULL);
-#line 934 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp92_) {
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							g_warning ("scanner.vala:935: Unable to set duplex ADF source, please file a bug");
-#line 9199 "scanner.c"
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							g_warning ("scanner.vala:961: Unable to set duplex ADF source, please file a bug");
+#line 9348 "scanner.c"
 						}
 					}
-#line 936 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9204 "scanner.c"
+#line 9353 "scanner.c"
 				}
 				default:
-#line 915 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 9209 "scanner.c"
+#line 9358 "scanner.c"
 			}
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources = (_vala_array_free (adf_duplex_sources, adf_duplex_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_back_sources = (_vala_array_free (adf_back_sources, adf_back_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_front_sources = (_vala_array_free (adf_front_sources, adf_front_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_sources = (_vala_array_free (adf_sources, adf_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources = (_vala_array_free (flatbed_sources, flatbed_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 9221 "scanner.c"
+#line 9370 "scanner.c"
 		}
-#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 967 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp93_ = self->priv->handle;
-#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 967 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp94_ = SANE_NAME_SCAN_MODE;
-#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 967 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp96_ = scanner_get_option_by_name (self, _tmp93_, _tmp94_, &_tmp95_);
-#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 967 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp95_;
-#line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 967 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp96_;
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp97_ = option;
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp97_ != NULL) {
-#line 9237 "scanner.c"
-			const gchar* _tmp98_;
-			gchar* _tmp99_;
-			gchar* _tmp100_;
-			gchar* _tmp101_;
-			gchar* _tmp102_;
+#line 9386 "scanner.c"
+			gchar** color_scan_modes = NULL;
+			const gchar* _tmp98_ = NULL;
+			gchar* _tmp99_ = NULL;
+			gchar* _tmp100_ = NULL;
+			gchar* _tmp101_ = NULL;
+			gchar* _tmp102_ = NULL;
 			gchar** _tmp103_ = NULL;
-			gchar** color_scan_modes;
-			gint color_scan_modes_length1;
-			gint _color_scan_modes_size_;
-			const gchar* _tmp104_;
-			gchar* _tmp105_;
-			gchar* _tmp106_;
-			gchar* _tmp107_;
+			gint color_scan_modes_length1 = 0;
+			gint _color_scan_modes_size_ = 0;
+			gchar** gray_scan_modes = NULL;
+			const gchar* _tmp104_ = NULL;
+			gchar* _tmp105_ = NULL;
+			gchar* _tmp106_ = NULL;
+			gchar* _tmp107_ = NULL;
 			const gchar* _tmp108_ = NULL;
-			gchar* _tmp109_;
-			gchar* _tmp110_;
-			gchar* _tmp111_;
+			gchar* _tmp109_ = NULL;
+			gchar* _tmp110_ = NULL;
+			gchar* _tmp111_ = NULL;
 			gchar** _tmp112_ = NULL;
-			gchar** gray_scan_modes;
-			gint gray_scan_modes_length1;
-			gint _gray_scan_modes_size_;
-			const gchar* _tmp113_;
-			gchar* _tmp114_;
-			gchar* _tmp115_;
-			gchar* _tmp116_;
+			gint gray_scan_modes_length1 = 0;
+			gint _gray_scan_modes_size_ = 0;
+			gchar** lineart_scan_modes = NULL;
+			const gchar* _tmp113_ = NULL;
+			gchar* _tmp114_ = NULL;
+			gchar* _tmp115_ = NULL;
+			gchar* _tmp116_ = NULL;
 			const gchar* _tmp117_ = NULL;
-			gchar* _tmp118_;
-			gchar* _tmp119_;
+			gchar* _tmp118_ = NULL;
+			gchar* _tmp119_ = NULL;
 			const gchar* _tmp120_ = NULL;
-			gchar* _tmp121_;
-			gchar* _tmp122_;
+			gchar* _tmp121_ = NULL;
+			gchar* _tmp122_ = NULL;
 			const gchar* _tmp123_ = NULL;
-			gchar* _tmp124_;
-			gchar* _tmp125_;
-			const gchar* _tmp126_;
-			gchar* _tmp127_;
-			gchar* _tmp128_;
-			gchar* _tmp129_;
+			gchar* _tmp124_ = NULL;
+			gchar* _tmp125_ = NULL;
+			const gchar* _tmp126_ = NULL;
+			gchar* _tmp127_ = NULL;
+			gchar* _tmp128_ = NULL;
+			gchar* _tmp129_ = NULL;
 			const gchar* _tmp130_ = NULL;
-			gchar* _tmp131_;
-			gchar* _tmp132_;
-			gchar* _tmp133_;
-			gchar* _tmp134_;
+			gchar* _tmp131_ = NULL;
+			gchar* _tmp132_ = NULL;
+			gchar* _tmp133_ = NULL;
+			gchar* _tmp134_ = NULL;
 			gchar** _tmp135_ = NULL;
-			gchar** lineart_scan_modes;
-			gint lineart_scan_modes_length1;
-			gint _lineart_scan_modes_size_;
-			ScanJob* _tmp136_;
-			ScanMode _tmp137_;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gint lineart_scan_modes_length1 = 0;
+			gint _lineart_scan_modes_size_ = 0;
+			ScanJob* _tmp136_ = NULL;
+			ScanMode _tmp137_ = 0;
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp98_ = SANE_VALUE_SCAN_MODE_COLOR;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp99_ = g_strdup (_tmp98_);
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp100_ = g_strdup ("Color");
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp101_ = g_strdup ("24bit Color");
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = g_strdup ("Color - 16 Million Colors");
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_ = g_new0 (gchar*, 4 + 1);
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_[0] = _tmp99_;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_[1] = _tmp100_;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_[2] = _tmp101_;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_[3] = _tmp102_;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes = _tmp103_;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes_length1 = 4;
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_color_scan_modes_size_ = color_scan_modes_length1;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp104_ = SANE_VALUE_SCAN_MODE_GRAY;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp105_ = g_strdup (_tmp104_);
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_ = g_strdup ("Gray");
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp107_ = g_strdup ("Grayscale");
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp108_ = SANE_I18N ("Grayscale");
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp109_ = g_strdup (_tmp108_);
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp110_ = g_strdup ("True Gray");
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp111_ = g_strdup ("Grayscale - 256 Levels");
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp112_ = g_new0 (gchar*, 6 + 1);
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp112_[0] = _tmp105_;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp112_[1] = _tmp106_;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp112_[2] = _tmp107_;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp112_[3] = _tmp109_;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp112_[4] = _tmp110_;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp112_[5] = _tmp111_;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			gray_scan_modes = _tmp112_;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			gray_scan_modes_length1 = 6;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_gray_scan_modes_size_ = gray_scan_modes_length1;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp113_ = SANE_VALUE_SCAN_MODE_LINEART;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp114_ = g_strdup (_tmp113_);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_ = g_strdup ("Lineart");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp116_ = g_strdup ("LineArt");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp117_ = SANE_I18N ("LineArt");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp118_ = g_strdup (_tmp117_);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp119_ = g_strdup ("Black & White");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp120_ = SANE_I18N ("Black & White");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp121_ = g_strdup (_tmp120_);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp122_ = g_strdup ("Binary");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp123_ = SANE_I18N ("Binary");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp124_ = g_strdup (_tmp123_);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp125_ = g_strdup ("Thresholded");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp126_ = SANE_VALUE_SCAN_MODE_GRAY;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp127_ = g_strdup (_tmp126_);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp128_ = g_strdup ("Gray");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp129_ = g_strdup ("Grayscale");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp130_ = SANE_I18N ("Grayscale");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp131_ = g_strdup (_tmp130_);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp132_ = g_strdup ("True Gray");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp133_ = g_strdup ("Black and White - Line Art");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp134_ = g_strdup ("Black and White - Halftone");
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_ = g_new0 (gchar*, 16 + 1);
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[0] = _tmp114_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[1] = _tmp115_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[2] = _tmp116_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[3] = _tmp118_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[4] = _tmp119_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[5] = _tmp121_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[6] = _tmp122_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[7] = _tmp124_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[8] = _tmp125_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[9] = _tmp127_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[10] = _tmp128_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[11] = _tmp129_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[12] = _tmp131_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[13] = _tmp132_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[14] = _tmp133_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_[15] = _tmp134_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			lineart_scan_modes = _tmp135_;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			lineart_scan_modes_length1 = 16;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_lineart_scan_modes_size_ = lineart_scan_modes_length1;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp136_ = job;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp137_ = _tmp136_->scan_mode;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			switch (_tmp137_) {
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_COLOR:
-#line 9441 "scanner.c"
+#line 9590 "scanner.c"
 				{
-					SANE_Handle _tmp138_;
-					SANE_Option_Descriptor* _tmp139_;
-					SANE_Int _tmp140_;
-					gchar** _tmp141_;
-					gint _tmp141__length1;
+					SANE_Handle _tmp138_ = {0};
+					SANE_Option_Descriptor* _tmp139_ = NULL;
+					SANE_Int _tmp140_ = {0};
+					gchar** _tmp141_ = NULL;
+					gint _tmp141__length1 = 0;
 					gboolean _tmp142_ = FALSE;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp138_ = self->priv->handle;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp139_ = option;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp140_ = index;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp141_ = color_scan_modes;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp141__length1 = color_scan_modes_length1;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp142_ = scanner_set_constrained_string_option (self, _tmp138_, _tmp139_, _tmp140_, _tmp141_, _tmp141__length1, NULL);
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp142_) {
-#line 985 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						g_warning ("scanner.vala:985: Unable to set Color mode, please file a bug");
-#line 9465 "scanner.c"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						g_warning ("scanner.vala:1011: Unable to set Color mode, please file a bug");
+#line 9614 "scanner.c"
 					}
-#line 986 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9469 "scanner.c"
+#line 9618 "scanner.c"
 				}
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_GRAY:
-#line 9473 "scanner.c"
+#line 9622 "scanner.c"
 				{
-					SANE_Handle _tmp143_;
-					SANE_Option_Descriptor* _tmp144_;
-					SANE_Int _tmp145_;
-					gchar** _tmp146_;
-					gint _tmp146__length1;
+					SANE_Handle _tmp143_ = {0};
+					SANE_Option_Descriptor* _tmp144_ = NULL;
+					SANE_Int _tmp145_ = {0};
+					gchar** _tmp146_ = NULL;
+					gint _tmp146__length1 = 0;
 					gboolean _tmp147_ = FALSE;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp143_ = self->priv->handle;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp144_ = option;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp145_ = index;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp146_ = gray_scan_modes;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp146__length1 = gray_scan_modes_length1;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp147_ = scanner_set_constrained_string_option (self, _tmp143_, _tmp144_, _tmp145_, _tmp146_, _tmp146__length1, NULL);
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp147_) {
-#line 989 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						g_warning ("scanner.vala:989: Unable to set Gray mode, please file a bug");
-#line 9497 "scanner.c"
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						g_warning ("scanner.vala:1015: Unable to set Gray mode, please file a bug");
+#line 9646 "scanner.c"
 					}
-#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9501 "scanner.c"
+#line 9650 "scanner.c"
 				}
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_LINEART:
-#line 9505 "scanner.c"
+#line 9654 "scanner.c"
 				{
-					SANE_Handle _tmp148_;
-					SANE_Option_Descriptor* _tmp149_;
-					SANE_Int _tmp150_;
-					gchar** _tmp151_;
-					gint _tmp151__length1;
+					SANE_Handle _tmp148_ = {0};
+					SANE_Option_Descriptor* _tmp149_ = NULL;
+					SANE_Int _tmp150_ = {0};
+					gchar** _tmp151_ = NULL;
+					gint _tmp151__length1 = 0;
 					gboolean _tmp152_ = FALSE;
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp148_ = self->priv->handle;
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp149_ = option;
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp150_ = index;
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp151_ = lineart_scan_modes;
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp151__length1 = lineart_scan_modes_length1;
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp152_ = scanner_set_constrained_string_option (self, _tmp148_, _tmp149_, _tmp150_, _tmp151_, _tmp151__length1, NULL);
-#line 992 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp152_) {
-#line 993 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						g_warning ("scanner.vala:993: Unable to set Lineart mode, please file a bug");
-#line 9529 "scanner.c"
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+						g_warning ("scanner.vala:1019: Unable to set Lineart mode, please file a bug");
+#line 9678 "scanner.c"
 					}
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9533 "scanner.c"
+#line 9682 "scanner.c"
 				}
 				default:
 				{
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9539 "scanner.c"
+#line 9688 "scanner.c"
 				}
 			}
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			lineart_scan_modes = (_vala_array_free (lineart_scan_modes, lineart_scan_modes_length1, (GDestroyNotify) g_free), NULL);
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			gray_scan_modes = (_vala_array_free (gray_scan_modes, gray_scan_modes_length1, (GDestroyNotify) g_free), NULL);
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 968 "/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 9548 "scanner.c"
+#line 9697 "scanner.c"
 		}
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp153_ = self->priv->handle;
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp155_ = scanner_get_option_by_name (self, _tmp153_, "duplex", &_tmp154_);
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp154_;
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp155_;
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp156_ = option;
-#line 1002 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp156_ != NULL) {
-#line 9562 "scanner.c"
-			SANE_Option_Descriptor* _tmp157_;
-			SANE_Value_Type _tmp158_;
-#line 1004 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 9711 "scanner.c"
+			SANE_Option_Descriptor* _tmp157_ = NULL;
+			SANE_Value_Type _tmp158_ = 0;
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp157_ = option;
-#line 1004 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp158_ = _tmp157_->type;
-#line 1004 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp158_ == SANE_TYPE_BOOL) {
-#line 9571 "scanner.c"
-				SANE_Handle _tmp159_;
-				SANE_Option_Descriptor* _tmp160_;
-				SANE_Int _tmp161_;
-				ScanJob* _tmp162_;
-				ScanType _tmp163_;
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 9720 "scanner.c"
+				SANE_Handle _tmp159_ = {0};
+				SANE_Option_Descriptor* _tmp160_ = NULL;
+				SANE_Int _tmp161_ = {0};
+				ScanJob* _tmp162_ = NULL;
+				ScanType _tmp163_ = 0;
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp159_ = self->priv->handle;
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp160_ = option;
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp161_ = index;
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp162_ = job;
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp163_ = _tmp162_->type;
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp159_, _tmp160_, _tmp161_, _tmp163_ == SCAN_TYPE_ADF_BOTH, NULL);
-#line 9589 "scanner.c"
+#line 9738 "scanner.c"
 			}
 		}
-#line 1009 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp164_ = self->priv->handle;
-#line 1009 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp166_ = scanner_get_option_by_name (self, _tmp164_, "batch-scan", &_tmp165_);
-#line 1009 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp165_;
-#line 1009 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp166_;
-#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp167_ = option;
-#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp167_ != NULL) {
-#line 9604 "scanner.c"
-			SANE_Option_Descriptor* _tmp168_;
-			SANE_Value_Type _tmp169_;
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 9753 "scanner.c"
+			SANE_Option_Descriptor* _tmp168_ = NULL;
+			SANE_Value_Type _tmp169_ = 0;
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp168_ = option;
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp169_ = _tmp168_->type;
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp169_ == SANE_TYPE_BOOL) {
-#line 9613 "scanner.c"
-				SANE_Handle _tmp170_;
-				SANE_Option_Descriptor* _tmp171_;
-				SANE_Int _tmp172_;
-				ScanJob* _tmp173_;
-				ScanType _tmp174_;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 9762 "scanner.c"
+				SANE_Handle _tmp170_ = {0};
+				SANE_Option_Descriptor* _tmp171_ = NULL;
+				SANE_Int _tmp172_ = {0};
+				ScanJob* _tmp173_ = NULL;
+				ScanType _tmp174_ = 0;
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp170_ = self->priv->handle;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp171_ = option;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp172_ = index;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp173_ = job;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp174_ = _tmp173_->type;
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp170_, _tmp171_, _tmp172_, _tmp174_ != SCAN_TYPE_SINGLE, NULL);
-#line 9631 "scanner.c"
+#line 9780 "scanner.c"
 			}
 		}
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp175_ = self->priv->handle;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp177_ = scanner_get_option_by_name (self, _tmp175_, "compression", &_tmp176_);
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp176_;
-#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp177_;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp178_ = option;
-#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp178_ != NULL) {
-#line 9646 "scanner.c"
+#line 9795 "scanner.c"
+			gchar** disable_compression_names = NULL;
 			const gchar* _tmp179_ = NULL;
-			gchar* _tmp180_;
+			gchar* _tmp180_ = NULL;
 			const gchar* _tmp181_ = NULL;
-			gchar* _tmp182_;
-			gchar* _tmp183_;
-			gchar* _tmp184_;
+			gchar* _tmp182_ = NULL;
+			gchar* _tmp183_ = NULL;
+			gchar* _tmp184_ = NULL;
 			gchar** _tmp185_ = NULL;
-			gchar** disable_compression_names;
-			gint disable_compression_names_length1;
-			gint _disable_compression_names_size_;
-			SANE_Handle _tmp186_;
-			SANE_Option_Descriptor* _tmp187_;
-			SANE_Int _tmp188_;
-			gchar** _tmp189_;
-			gint _tmp189__length1;
+			gint disable_compression_names_length1 = 0;
+			gint _disable_compression_names_size_ = 0;
+			SANE_Handle _tmp186_ = {0};
+			SANE_Option_Descriptor* _tmp187_ = NULL;
+			SANE_Int _tmp188_ = {0};
+			gchar** _tmp189_ = NULL;
+			gint _tmp189__length1 = 0;
 			gboolean _tmp190_ = FALSE;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp179_ = SANE_I18N ("None");
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp180_ = g_strdup (_tmp179_);
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp181_ = SANE_I18N ("none");
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp182_ = g_strdup (_tmp181_);
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp183_ = g_strdup ("None");
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp184_ = g_strdup ("none");
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp185_ = g_new0 (gchar*, 4 + 1);
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp185_[0] = _tmp180_;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp185_[1] = _tmp182_;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp185_[2] = _tmp183_;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp185_[3] = _tmp184_;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names = _tmp185_;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names_length1 = 4;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_disable_compression_names_size_ = disable_compression_names_length1;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp186_ = self->priv->handle;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp187_ = option;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_ = index;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp189_ = disable_compression_names;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp189__length1 = disable_compression_names_length1;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp190_ = scanner_set_constrained_string_option (self, _tmp186_, _tmp187_, _tmp188_, _tmp189_, _tmp189__length1, NULL);
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp190_) {
-#line 1029 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				g_warning ("scanner.vala:1029: Unable to disable compression, please file a bug");
-#line 9707 "scanner.c"
-			}
-#line 1018 "/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 9711 "scanner.c"
-		}
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp191_ = self->priv->handle;
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp192_ = SANE_NAME_SCAN_RESOLUTION;
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp194_ = scanner_get_option_by_name (self, _tmp191_, _tmp192_, &_tmp193_);
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp193_;
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp194_;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp195_ = option;
-#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp195_ != NULL) {
-#line 9727 "scanner.c"
-			SANE_Option_Descriptor* _tmp196_;
-			SANE_Value_Type _tmp197_;
-			SANE_Handle _tmp213_;
-			const gchar* _tmp214_;
-			gint _tmp215_ = 0;
-			SANE_Option_Descriptor* _tmp216_ = NULL;
-			SANE_Option_Descriptor* _tmp217_;
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp196_ = option;
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp197_ = _tmp196_->type;
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp197_ == SANE_TYPE_FIXED) {
-#line 9741 "scanner.c"
-				SANE_Handle _tmp198_;
-				SANE_Option_Descriptor* _tmp199_;
-				SANE_Int _tmp200_;
-				ScanJob* _tmp201_;
-				gdouble _tmp202_;
-				ScanJob* _tmp203_;
-				gdouble _tmp204_ = 0.0;
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp198_ = self->priv->handle;
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp199_ = option;
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp200_ = index;
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp201_ = job;
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp202_ = _tmp201_->dpi;
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp203_ = job;
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_fixed_option (self, _tmp198_, _tmp199_, _tmp200_, _tmp202_, &_tmp204_);
-#line 1037 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp203_->dpi = _tmp204_;
-#line 9765 "scanner.c"
-			} else {
-				gint dpi = 0;
-				SANE_Handle _tmp205_;
-				SANE_Option_Descriptor* _tmp206_;
-				SANE_Int _tmp207_;
-				ScanJob* _tmp208_;
-				gdouble _tmp209_;
-				gint _tmp210_ = 0;
-				ScanJob* _tmp211_;
-				gint _tmp212_;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp205_ = self->priv->handle;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp206_ = option;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp207_ = index;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp208_ = job;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp209_ = _tmp208_->dpi;
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_int_option (self, _tmp205_, _tmp206_, _tmp207_, (gint) _tmp209_, &_tmp210_);
-#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				dpi = _tmp210_;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp211_ = job;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp212_ = dpi;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp211_->dpi = (gdouble) _tmp212_;
-#line 9796 "scanner.c"
+#line 1055 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				g_warning ("scanner.vala:1055: Unable to disable compression, please file a bug");
+#line 9856 "scanner.c"
 			}
 #line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp213_ = self->priv->handle;
-#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp214_ = SANE_NAME_BIT_DEPTH;
-#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp216_ = scanner_get_option_by_name (self, _tmp213_, _tmp214_, &_tmp215_);
-#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp215_;
-#line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp216_;
-#line 1045 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp217_ = option;
-#line 1045 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp217_ != NULL) {
-#line 9812 "scanner.c"
-				ScanJob* _tmp218_;
-				gint _tmp219_;
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp218_ = job;
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp219_ = _tmp218_->depth;
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp219_ > 0) {
-#line 9821 "scanner.c"
-					SANE_Handle _tmp220_;
-					SANE_Option_Descriptor* _tmp221_;
-					SANE_Int _tmp222_;
-					ScanJob* _tmp223_;
-					gint _tmp224_;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp220_ = self->priv->handle;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp221_ = option;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp222_ = index;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp223_ = job;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp224_ = _tmp223_->depth;
-#line 1048 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_int_option (self, _tmp220_, _tmp221_, _tmp222_, _tmp224_, NULL);
-#line 9839 "scanner.c"
-				}
-			}
+			disable_compression_names = (_vala_array_free (disable_compression_names, disable_compression_names_length1, (GDestroyNotify) g_free), NULL);
+#line 9860 "scanner.c"
 		}
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp225_ = self->priv->handle;
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp226_ = SANE_NAME_SCAN_BR_X;
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp228_ = scanner_get_option_by_name (self, _tmp225_, _tmp226_, &_tmp227_);
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp227_;
-#line 1053 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp228_;
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp229_ = option;
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp229_ != NULL) {
-#line 9857 "scanner.c"
-			SANE_Option_Descriptor* _tmp230_;
-			SANE_Constraint_Type _tmp231_;
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp230_ = option;
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp231_ = _tmp230_->constraint_type;
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp231_ == SANE_CONSTRAINT_RANGE) {
-#line 9866 "scanner.c"
-				SANE_Option_Descriptor* _tmp232_;
-				SANE_Value_Type _tmp233_;
-#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp232_ = option;
-#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp233_ = _tmp232_->type;
-#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp233_ == SANE_TYPE_FIXED) {
-#line 9875 "scanner.c"
-					SANE_Handle _tmp234_;
-					SANE_Option_Descriptor* _tmp235_;
-					SANE_Int _tmp236_;
-					SANE_Option_Descriptor* _tmp237_;
-					SANE_Range* _tmp238_;
-					SANE_Word _tmp239_;
-					gdouble _tmp240_ = 0.0;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp234_ = self->priv->handle;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp235_ = option;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp236_ = index;
 #line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp237_ = option;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp238_ = _tmp237_->constraint.range;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp239_ = _tmp238_->max;
-#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp240_ = SANE_UNFIX ((SANE_Fixed) _tmp239_);
+		_tmp191_ = self->priv->handle;
 #line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_fixed_option (self, _tmp234_, _tmp235_, _tmp236_, _tmp240_, NULL);
-#line 9899 "scanner.c"
-				} else {
-					SANE_Handle _tmp241_;
-					SANE_Option_Descriptor* _tmp242_;
-					SANE_Int _tmp243_;
-					SANE_Option_Descriptor* _tmp244_;
-					SANE_Range* _tmp245_;
-					SANE_Word _tmp246_;
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp241_ = self->priv->handle;
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp242_ = option;
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp243_ = index;
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp244_ = option;
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp245_ = _tmp244_->constraint.range;
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp246_ = _tmp245_->max;
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_int_option (self, _tmp241_, _tmp242_, _tmp243_, (gint) _tmp246_, NULL);
-#line 9921 "scanner.c"
-				}
-			}
-		}
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp247_ = self->priv->handle;
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp248_ = SANE_NAME_SCAN_BR_Y;
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp250_ = scanner_get_option_by_name (self, _tmp247_, _tmp248_, &_tmp249_);
+		_tmp192_ = SANE_NAME_SCAN_RESOLUTION;
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp194_ = scanner_get_option_by_name (self, _tmp191_, _tmp192_, &_tmp193_);
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		index = (SANE_Int) _tmp193_;
+#line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp194_;
+#line 1060 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp195_ = option;
+#line 1060 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp195_ != NULL) {
+#line 9876 "scanner.c"
+			SANE_Handle _tmp196_ = {0};
+			SANE_Option_Descriptor* _tmp197_ = NULL;
+			SANE_Int _tmp198_ = {0};
+			ScanJob* _tmp199_ = NULL;
+			gdouble _tmp200_ = 0.0;
+			ScanJob* _tmp201_ = NULL;
+			gdouble _tmp202_ = 0.0;
+			SANE_Handle _tmp203_ = {0};
+			const gchar* _tmp204_ = NULL;
+			gint _tmp205_ = 0;
+			SANE_Option_Descriptor* _tmp206_ = NULL;
+			SANE_Option_Descriptor* _tmp207_ = NULL;
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp196_ = self->priv->handle;
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp197_ = option;
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp198_ = index;
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp199_ = job;
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp200_ = _tmp199_->dpi;
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp201_ = job;
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			scanner_set_fixed_or_int_option (self, _tmp196_, _tmp197_, _tmp198_, _tmp200_, &_tmp202_);
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp201_->dpi = _tmp202_;
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp203_ = self->priv->handle;
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp204_ = SANE_NAME_BIT_DEPTH;
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp206_ = scanner_get_option_by_name (self, _tmp203_, _tmp204_, &_tmp205_);
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			index = (SANE_Int) _tmp205_;
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			option = _tmp206_;
 #line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp249_;
+			_tmp207_ = option;
 #line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp250_;
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp251_ = option;
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp251_ != NULL) {
-#line 9939 "scanner.c"
-			SANE_Option_Descriptor* _tmp252_;
-			SANE_Constraint_Type _tmp253_;
+			if (_tmp207_ != NULL) {
+#line 9919 "scanner.c"
+				ScanJob* _tmp208_ = NULL;
+				gint _tmp209_ = 0;
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp208_ = job;
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp209_ = _tmp208_->depth;
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				if (_tmp209_ > 0) {
+#line 9928 "scanner.c"
+					SANE_Handle _tmp210_ = {0};
+					SANE_Option_Descriptor* _tmp211_ = NULL;
+					SANE_Int _tmp212_ = {0};
+					ScanJob* _tmp213_ = NULL;
+					gint _tmp214_ = 0;
 #line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp252_ = option;
+					_tmp210_ = self->priv->handle;
 #line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp253_ = _tmp252_->constraint_type;
+					_tmp211_ = option;
 #line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp253_ == SANE_CONSTRAINT_RANGE) {
-#line 9948 "scanner.c"
-				SANE_Option_Descriptor* _tmp254_;
-				SANE_Value_Type _tmp255_;
-#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp254_ = option;
-#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp255_ = _tmp254_->type;
-#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp255_ == SANE_TYPE_FIXED) {
-#line 9957 "scanner.c"
-					SANE_Handle _tmp256_;
-					SANE_Option_Descriptor* _tmp257_;
-					SANE_Int _tmp258_;
-					SANE_Option_Descriptor* _tmp259_;
-					SANE_Range* _tmp260_;
-					SANE_Word _tmp261_;
-					gdouble _tmp262_ = 0.0;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp256_ = self->priv->handle;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp257_ = option;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp258_ = index;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp259_ = option;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp260_ = _tmp259_->constraint.range;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp261_ = _tmp260_->max;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp262_ = SANE_UNFIX ((SANE_Fixed) _tmp261_);
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_fixed_option (self, _tmp256_, _tmp257_, _tmp258_, _tmp262_, NULL);
-#line 9981 "scanner.c"
-				} else {
-					SANE_Handle _tmp263_;
-					SANE_Option_Descriptor* _tmp264_;
-					SANE_Int _tmp265_;
-					SANE_Option_Descriptor* _tmp266_;
-					SANE_Range* _tmp267_;
-					SANE_Word _tmp268_;
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp263_ = self->priv->handle;
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp264_ = option;
+					_tmp212_ = index;
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp213_ = job;
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					_tmp214_ = _tmp213_->depth;
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					scanner_set_int_option (self, _tmp210_, _tmp211_, _tmp212_, _tmp214_, NULL);
+#line 9946 "scanner.c"
+				}
+			}
+		}
 #line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp265_ = index;
+		_tmp215_ = self->priv->handle;
 #line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp266_ = option;
+		_tmp216_ = SANE_NAME_SCAN_BR_X;
 #line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp267_ = _tmp266_->constraint.range;
+		_tmp218_ = scanner_get_option_by_name (self, _tmp215_, _tmp216_, &_tmp217_);
 #line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp268_ = _tmp267_->max;
+		index = (SANE_Int) _tmp217_;
 #line 1072 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_int_option (self, _tmp263_, _tmp264_, _tmp265_, (gint) _tmp268_, NULL);
-#line 10003 "scanner.c"
-				}
-			}
-		}
+		option = _tmp218_;
+#line 1073 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp219_ = option;
+#line 1073 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp219_ != NULL) {
+#line 9964 "scanner.c"
+			ScanJob* _tmp220_ = NULL;
+			gint _tmp221_ = 0;
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp220_ = job;
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp221_ = _tmp220_->page_width;
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp221_ > 0) {
+#line 9973 "scanner.c"
+				SANE_Handle _tmp222_ = {0};
+				SANE_Option_Descriptor* _tmp223_ = NULL;
+				SANE_Int _tmp224_ = {0};
+				SANE_Option_Descriptor* _tmp225_ = NULL;
+				ScanJob* _tmp226_ = NULL;
+				gint _tmp227_ = 0;
+				ScanJob* _tmp228_ = NULL;
+				gdouble _tmp229_ = 0.0;
+				gdouble _tmp230_ = 0.0;
 #line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp269_ = self->priv->handle;
+				_tmp222_ = self->priv->handle;
 #line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp270_ = SANE_NAME_PAGE_WIDTH;
+				_tmp223_ = option;
 #line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp272_ = scanner_get_option_by_name (self, _tmp269_, _tmp270_, &_tmp271_);
+				_tmp224_ = index;
 #line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp271_;
+				_tmp225_ = option;
 #line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp272_;
-#line 1077 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp273_ = option;
-#line 1077 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp273_ != NULL) {
-#line 10021 "scanner.c"
-			ScanJob* _tmp274_;
-			gint _tmp275_;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp274_ = job;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp275_ = _tmp274_->page_width;
-#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (((gdouble) _tmp275_) > 0.0) {
-#line 10030 "scanner.c"
-				SANE_Option_Descriptor* _tmp276_;
-				SANE_Value_Type _tmp277_;
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp276_ = option;
+				_tmp226_ = job;
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp227_ = _tmp226_->page_width;
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp228_ = job;
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp229_ = _tmp228_->dpi;
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp230_ = scanner_convert_page_size (self, _tmp225_, (gdouble) _tmp227_, _tmp229_);
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_fixed_or_int_option (self, _tmp222_, _tmp223_, _tmp224_, _tmp230_, NULL);
+#line 10003 "scanner.c"
+			} else {
+				SANE_Handle _tmp231_ = {0};
+				SANE_Option_Descriptor* _tmp232_ = NULL;
+				SANE_Int _tmp233_ = {0};
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp231_ = self->priv->handle;
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp232_ = option;
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp233_ = index;
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_option_to_max (self, _tmp231_, _tmp232_, _tmp233_);
+#line 10016 "scanner.c"
+			}
+		}
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp234_ = self->priv->handle;
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp235_ = SANE_NAME_SCAN_BR_Y;
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp237_ = scanner_get_option_by_name (self, _tmp234_, _tmp235_, &_tmp236_);
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		index = (SANE_Int) _tmp236_;
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp237_;
 #line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp277_ = _tmp276_->type;
+		_tmp238_ = option;
 #line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp277_ == SANE_TYPE_FIXED) {
-#line 10039 "scanner.c"
-					SANE_Handle _tmp278_;
-					SANE_Option_Descriptor* _tmp279_;
-					SANE_Int _tmp280_;
-					ScanJob* _tmp281_;
-					gint _tmp282_;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp278_ = self->priv->handle;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp279_ = option;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp280_ = index;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp281_ = job;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp282_ = _tmp281_->page_width;
-#line 1082 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_fixed_option (self, _tmp278_, _tmp279_, _tmp280_, _tmp282_ / 10.0, NULL);
-#line 10057 "scanner.c"
-				} else {
-					SANE_Handle _tmp283_;
-					SANE_Option_Descriptor* _tmp284_;
-					SANE_Int _tmp285_;
-					ScanJob* _tmp286_;
-					gint _tmp287_;
+		if (_tmp238_ != NULL) {
+#line 10033 "scanner.c"
+			ScanJob* _tmp239_ = NULL;
+			gint _tmp240_ = 0;
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp239_ = job;
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp240_ = _tmp239_->page_height;
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp240_ > 0) {
+#line 10042 "scanner.c"
+				SANE_Handle _tmp241_ = {0};
+				SANE_Option_Descriptor* _tmp242_ = NULL;
+				SANE_Int _tmp243_ = {0};
+				SANE_Option_Descriptor* _tmp244_ = NULL;
+				ScanJob* _tmp245_ = NULL;
+				gint _tmp246_ = 0;
+				ScanJob* _tmp247_ = NULL;
+				gdouble _tmp248_ = 0.0;
+				gdouble _tmp249_ = 0.0;
 #line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp283_ = self->priv->handle;
+				_tmp241_ = self->priv->handle;
 #line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp284_ = option;
+				_tmp242_ = option;
 #line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp285_ = index;
+				_tmp243_ = index;
 #line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp286_ = job;
+				_tmp244_ = option;
 #line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp287_ = _tmp286_->page_width;
+				_tmp245_ = job;
 #line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_int_option (self, _tmp283_, _tmp284_, _tmp285_, _tmp287_ / 10, NULL);
-#line 10076 "scanner.c"
-				}
+				_tmp246_ = _tmp245_->page_height;
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp247_ = job;
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp248_ = _tmp247_->dpi;
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp249_ = scanner_convert_page_size (self, _tmp244_, (gdouble) _tmp246_, _tmp248_);
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_fixed_or_int_option (self, _tmp241_, _tmp242_, _tmp243_, _tmp249_, NULL);
+#line 10072 "scanner.c"
+			} else {
+				SANE_Handle _tmp250_ = {0};
+				SANE_Option_Descriptor* _tmp251_ = NULL;
+				SANE_Int _tmp252_ = {0};
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp250_ = self->priv->handle;
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp251_ = option;
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp252_ = index;
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_option_to_max (self, _tmp250_, _tmp251_, _tmp252_);
+#line 10085 "scanner.c"
 			}
 		}
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp288_ = self->priv->handle;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp289_ = SANE_NAME_PAGE_HEIGHT;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp291_ = scanner_get_option_by_name (self, _tmp288_, _tmp289_, &_tmp290_);
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp290_;
-#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp291_;
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp292_ = option;
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp292_ != NULL) {
-#line 10094 "scanner.c"
-			ScanJob* _tmp293_;
-			gint _tmp294_;
 #line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp293_ = job;
+		_tmp253_ = self->priv->handle;
 #line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp294_ = _tmp293_->page_height;
+		_tmp254_ = SANE_NAME_PAGE_WIDTH;
 #line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (((gdouble) _tmp294_) > 0.0) {
-#line 10103 "scanner.c"
-				SANE_Option_Descriptor* _tmp295_;
-				SANE_Value_Type _tmp296_;
+		_tmp256_ = scanner_get_option_by_name (self, _tmp253_, _tmp254_, &_tmp255_);
+#line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		index = (SANE_Int) _tmp255_;
+#line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp256_;
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp258_ = option;
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp258_ != NULL) {
+#line 10102 "scanner.c"
+			ScanJob* _tmp259_ = NULL;
+			gint _tmp260_ = 0;
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp259_ = job;
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp260_ = _tmp259_->page_width;
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp257_ = ((gdouble) _tmp260_) > 0.0;
+#line 10111 "scanner.c"
+		} else {
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp257_ = FALSE;
+#line 10115 "scanner.c"
+		}
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp261_ = _tmp257_;
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp261_) {
+#line 10121 "scanner.c"
+			SANE_Handle _tmp262_ = {0};
+			SANE_Option_Descriptor* _tmp263_ = NULL;
+			SANE_Int _tmp264_ = {0};
+			SANE_Option_Descriptor* _tmp265_ = NULL;
+			ScanJob* _tmp266_ = NULL;
+			gint _tmp267_ = 0;
+			ScanJob* _tmp268_ = NULL;
+			gdouble _tmp269_ = 0.0;
+			gdouble _tmp270_ = 0.0;
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp295_ = option;
+			_tmp262_ = self->priv->handle;
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp296_ = _tmp295_->type;
+			_tmp263_ = option;
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp296_ == SANE_TYPE_FIXED) {
-#line 10112 "scanner.c"
-					SANE_Handle _tmp297_;
-					SANE_Option_Descriptor* _tmp298_;
-					SANE_Int _tmp299_;
-					ScanJob* _tmp300_;
-					gint _tmp301_;
-#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp297_ = self->priv->handle;
+			_tmp264_ = index;
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp265_ = option;
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp266_ = job;
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp267_ = _tmp266_->page_width;
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp268_ = job;
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp269_ = _tmp268_->dpi;
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp270_ = scanner_convert_page_size (self, _tmp265_, (gdouble) _tmp267_, _tmp269_);
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			scanner_set_fixed_or_int_option (self, _tmp262_, _tmp263_, _tmp264_, _tmp270_, NULL);
+#line 10151 "scanner.c"
+		}
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp298_ = option;
+		_tmp271_ = self->priv->handle;
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp299_ = index;
+		_tmp272_ = SANE_NAME_PAGE_HEIGHT;
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp300_ = job;
+		_tmp274_ = scanner_get_option_by_name (self, _tmp271_, _tmp272_, &_tmp273_);
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp301_ = _tmp300_->page_height;
+		index = (SANE_Int) _tmp273_;
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_fixed_option (self, _tmp297_, _tmp298_, _tmp299_, _tmp301_ / 10.0, NULL);
-#line 10130 "scanner.c"
-				} else {
-					SANE_Handle _tmp302_;
-					SANE_Option_Descriptor* _tmp303_;
-					SANE_Int _tmp304_;
-					ScanJob* _tmp305_;
-					gint _tmp306_;
+		option = _tmp274_;
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp276_ = option;
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp276_ != NULL) {
+#line 10167 "scanner.c"
+			ScanJob* _tmp277_ = NULL;
+			gint _tmp278_ = 0;
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp277_ = job;
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp278_ = _tmp277_->page_height;
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp275_ = ((gdouble) _tmp278_) > 0.0;
+#line 10176 "scanner.c"
+		} else {
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp275_ = FALSE;
+#line 10180 "scanner.c"
+		}
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp279_ = _tmp275_;
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp279_) {
+#line 10186 "scanner.c"
+			SANE_Handle _tmp280_ = {0};
+			SANE_Option_Descriptor* _tmp281_ = NULL;
+			SANE_Int _tmp282_ = {0};
+			SANE_Option_Descriptor* _tmp283_ = NULL;
+			ScanJob* _tmp284_ = NULL;
+			gint _tmp285_ = 0;
+			ScanJob* _tmp286_ = NULL;
+			gdouble _tmp287_ = 0.0;
+			gdouble _tmp288_ = 0.0;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp302_ = self->priv->handle;
+			_tmp280_ = self->priv->handle;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp303_ = option;
+			_tmp281_ = option;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp304_ = index;
+			_tmp282_ = index;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp305_ = job;
+			_tmp283_ = option;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp306_ = _tmp305_->page_height;
+			_tmp284_ = job;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					scanner_set_int_option (self, _tmp302_, _tmp303_, _tmp304_, _tmp306_ / 10, NULL);
-#line 10149 "scanner.c"
-				}
-			}
+			_tmp285_ = _tmp284_->page_height;
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp286_ = job;
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp287_ = _tmp286_->dpi;
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp288_ = scanner_convert_page_size (self, _tmp283_, (gdouble) _tmp285_, _tmp287_);
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			scanner_set_fixed_or_int_option (self, _tmp280_, _tmp281_, _tmp282_, _tmp288_, NULL);
+#line 10216 "scanner.c"
 		}
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp289_ = self->priv->handle;
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp290_ = SANE_NAME_BRIGHTNESS;
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp292_ = scanner_get_option_by_name (self, _tmp289_, _tmp290_, &_tmp291_);
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		index = (SANE_Int) _tmp291_;
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp292_;
 #line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp307_ = self->priv->handle;
+		_tmp293_ = option;
 #line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp308_ = SANE_NAME_BRIGHTNESS;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp310_ = scanner_get_option_by_name (self, _tmp307_, _tmp308_, &_tmp309_);
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp309_;
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp310_;
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp311_ = option;
-#line 1099 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp311_ != NULL) {
-#line 10167 "scanner.c"
-			ScanJob* _tmp312_;
-			gint _tmp313_;
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp312_ = job;
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp313_ = _tmp312_->brightness;
-#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp313_ != 0) {
-#line 10176 "scanner.c"
-				SANE_Option_Descriptor* _tmp314_;
-				ScanJob* _tmp315_;
-				gint _tmp316_;
-				gint _tmp317_ = 0;
-				gint brightness;
-				SANE_Handle _tmp318_;
-				SANE_Option_Descriptor* _tmp319_;
-				SANE_Int _tmp320_;
-				gint _tmp321_;
+		if (_tmp293_ != NULL) {
+#line 10232 "scanner.c"
+			ScanJob* _tmp294_ = NULL;
+			gint _tmp295_ = 0;
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp294_ = job;
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp295_ = _tmp294_->brightness;
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp295_ != 0) {
+#line 10241 "scanner.c"
+				gint brightness = 0;
+				SANE_Option_Descriptor* _tmp296_ = NULL;
+				ScanJob* _tmp297_ = NULL;
+				gint _tmp298_ = 0;
+				gint _tmp299_ = 0;
+				SANE_Handle _tmp300_ = {0};
+				SANE_Option_Descriptor* _tmp301_ = NULL;
+				SANE_Int _tmp302_ = {0};
+				gint _tmp303_ = 0;
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp296_ = option;
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp297_ = job;
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp298_ = _tmp297_->brightness;
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp299_ = scanner_scale_int (self, -100, 100, _tmp296_, _tmp298_);
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				brightness = _tmp299_;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp314_ = option;
+				_tmp300_ = self->priv->handle;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp315_ = job;
+				_tmp301_ = option;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp316_ = _tmp315_->brightness;
+				_tmp302_ = index;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp317_ = scanner_scale_int (self, -100, 100, _tmp314_, _tmp316_);
+				_tmp303_ = brightness;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				brightness = _tmp317_;
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp318_ = self->priv->handle;
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp319_ = option;
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp320_ = index;
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp321_ = brightness;
-#line 1104 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_int_option (self, _tmp318_, _tmp319_, _tmp320_, _tmp321_, NULL);
-#line 10206 "scanner.c"
+				scanner_set_int_option (self, _tmp300_, _tmp301_, _tmp302_, _tmp303_, NULL);
+#line 10271 "scanner.c"
 			}
 		}
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp304_ = self->priv->handle;
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp305_ = SANE_NAME_CONTRAST;
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp307_ = scanner_get_option_by_name (self, _tmp304_, _tmp305_, &_tmp306_);
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		index = (SANE_Int) _tmp306_;
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		option = _tmp307_;
 #line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp322_ = self->priv->handle;
-#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp323_ = SANE_NAME_CONTRAST;
-#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp325_ = scanner_get_option_by_name (self, _tmp322_, _tmp323_, &_tmp324_);
+		_tmp308_ = option;
 #line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp324_;
-#line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp325_;
-#line 1108 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp326_ = option;
-#line 1108 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp326_ != NULL) {
-#line 10223 "scanner.c"
-			ScanJob* _tmp327_;
-			gint _tmp328_;
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp327_ = job;
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp328_ = _tmp327_->contrast;
-#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp328_ != 0) {
-#line 10232 "scanner.c"
-				SANE_Option_Descriptor* _tmp329_;
-				ScanJob* _tmp330_;
-				gint _tmp331_;
-				gint _tmp332_ = 0;
-				gint contrast;
-				SANE_Handle _tmp333_;
-				SANE_Option_Descriptor* _tmp334_;
-				SANE_Int _tmp335_;
-				gint _tmp336_;
+		if (_tmp308_ != NULL) {
+#line 10288 "scanner.c"
+			ScanJob* _tmp309_ = NULL;
+			gint _tmp310_ = 0;
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp309_ = job;
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp310_ = _tmp309_->contrast;
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			if (_tmp310_ != 0) {
+#line 10297 "scanner.c"
+				gint contrast = 0;
+				SANE_Option_Descriptor* _tmp311_ = NULL;
+				ScanJob* _tmp312_ = NULL;
+				gint _tmp313_ = 0;
+				gint _tmp314_ = 0;
+				SANE_Handle _tmp315_ = {0};
+				SANE_Option_Descriptor* _tmp316_ = NULL;
+				SANE_Int _tmp317_ = {0};
+				gint _tmp318_ = 0;
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp311_ = option;
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp312_ = job;
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp313_ = _tmp312_->contrast;
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp314_ = scanner_scale_int (self, -100, 100, _tmp311_, _tmp313_);
+#line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				contrast = _tmp314_;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp329_ = option;
+				_tmp315_ = self->priv->handle;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp330_ = job;
+				_tmp316_ = option;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp331_ = _tmp330_->contrast;
+				_tmp317_ = index;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp332_ = scanner_scale_int (self, -100, 100, _tmp329_, _tmp331_);
+				_tmp318_ = contrast;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				contrast = _tmp332_;
-#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp333_ = self->priv->handle;
-#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp334_ = option;
-#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp335_ = index;
-#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp336_ = contrast;
-#line 1113 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_int_option (self, _tmp333_, _tmp334_, _tmp335_, _tmp336_, NULL);
-#line 10262 "scanner.c"
+				scanner_set_int_option (self, _tmp315_, _tmp316_, _tmp317_, _tmp318_, NULL);
+#line 10327 "scanner.c"
 			}
 		}
-#line 1118 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp337_ = self->priv->current_device;
-#line 1118 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (g_strcmp0 (_tmp337_, "test") == 0) {
-#line 10269 "scanner.c"
-			SANE_Handle _tmp338_;
-			gint _tmp339_ = 0;
-			SANE_Option_Descriptor* _tmp340_ = NULL;
-			SANE_Option_Descriptor* _tmp341_;
-			SANE_Handle _tmp345_;
-			gint _tmp346_ = 0;
-			SANE_Option_Descriptor* _tmp347_ = NULL;
-			SANE_Option_Descriptor* _tmp348_;
-			SANE_Handle _tmp352_;
-			gint _tmp353_ = 0;
-			SANE_Option_Descriptor* _tmp354_ = NULL;
-			SANE_Option_Descriptor* _tmp355_;
-			SANE_Handle _tmp359_;
-			gint _tmp360_ = 0;
-			SANE_Option_Descriptor* _tmp361_ = NULL;
-			SANE_Option_Descriptor* _tmp362_;
-			SANE_Handle _tmp366_;
-			gint _tmp367_ = 0;
-			SANE_Option_Descriptor* _tmp368_ = NULL;
-			SANE_Option_Descriptor* _tmp369_;
-#line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp338_ = self->priv->handle;
-#line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp340_ = scanner_get_option_by_name (self, _tmp338_, "hand-scanner", &_tmp339_);
+#line 1117 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp319_ = self->priv->current_device;
+#line 1117 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (g_strcmp0 (_tmp319_, "test") == 0) {
+#line 10334 "scanner.c"
+			SANE_Handle _tmp320_ = {0};
+			gint _tmp321_ = 0;
+			SANE_Option_Descriptor* _tmp322_ = NULL;
+			SANE_Option_Descriptor* _tmp323_ = NULL;
+			SANE_Handle _tmp327_ = {0};
+			gint _tmp328_ = 0;
+			SANE_Option_Descriptor* _tmp329_ = NULL;
+			SANE_Option_Descriptor* _tmp330_ = NULL;
+			SANE_Handle _tmp334_ = {0};
+			gint _tmp335_ = 0;
+			SANE_Option_Descriptor* _tmp336_ = NULL;
+			SANE_Option_Descriptor* _tmp337_ = NULL;
+			SANE_Handle _tmp341_ = {0};
+			gint _tmp342_ = 0;
+			SANE_Option_Descriptor* _tmp343_ = NULL;
+			SANE_Option_Descriptor* _tmp344_ = NULL;
+			SANE_Handle _tmp348_ = {0};
+			gint _tmp349_ = 0;
+			SANE_Option_Descriptor* _tmp350_ = NULL;
+			SANE_Option_Descriptor* _tmp351_ = NULL;
+#line 1119 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp320_ = self->priv->handle;
+#line 1119 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp322_ = scanner_get_option_by_name (self, _tmp320_, "hand-scanner", &_tmp321_);
+#line 1119 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			index = (SANE_Int) _tmp321_;
+#line 1119 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			option = _tmp322_;
 #line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp339_;
+			_tmp323_ = option;
 #line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp340_;
+			if (_tmp323_ != NULL) {
+#line 10367 "scanner.c"
+				SANE_Handle _tmp324_ = {0};
+				SANE_Option_Descriptor* _tmp325_ = NULL;
+				SANE_Int _tmp326_ = {0};
 #line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp341_ = option;
+				_tmp324_ = self->priv->handle;
 #line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp341_ != NULL) {
-#line 10302 "scanner.c"
-				SANE_Handle _tmp342_;
-				SANE_Option_Descriptor* _tmp343_;
-				SANE_Int _tmp344_;
+				_tmp325_ = option;
+#line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp326_ = index;
+#line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_bool_option (self, _tmp324_, _tmp325_, _tmp326_, FALSE, NULL);
+#line 10379 "scanner.c"
+			}
 #line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp342_ = self->priv->handle;
+			_tmp327_ = self->priv->handle;
 #line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp343_ = option;
+			_tmp329_ = scanner_get_option_by_name (self, _tmp327_, "three-pass", &_tmp328_);
 #line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp344_ = index;
+			index = (SANE_Int) _tmp328_;
 #line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_bool_option (self, _tmp342_, _tmp343_, _tmp344_, FALSE, NULL);
-#line 10314 "scanner.c"
-			}
+			option = _tmp329_;
 #line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp345_ = self->priv->handle;
+			_tmp330_ = option;
 #line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp347_ = scanner_get_option_by_name (self, _tmp345_, "three-pass", &_tmp346_);
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp346_;
-#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp347_;
+			if (_tmp330_ != NULL) {
+#line 10393 "scanner.c"
+				SANE_Handle _tmp331_ = {0};
+				SANE_Option_Descriptor* _tmp332_ = NULL;
+				SANE_Int _tmp333_ = {0};
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp331_ = self->priv->handle;
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp332_ = option;
 #line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp348_ = option;
+				_tmp333_ = index;
 #line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp348_ != NULL) {
-#line 10328 "scanner.c"
-				SANE_Handle _tmp349_;
-				SANE_Option_Descriptor* _tmp350_;
-				SANE_Int _tmp351_;
+				scanner_set_bool_option (self, _tmp331_, _tmp332_, _tmp333_, FALSE, NULL);
+#line 10405 "scanner.c"
+			}
 #line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp349_ = self->priv->handle;
+			_tmp334_ = self->priv->handle;
 #line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp350_ = option;
+			_tmp336_ = scanner_get_option_by_name (self, _tmp334_, "test-picture", &_tmp335_);
 #line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp351_ = index;
+			index = (SANE_Int) _tmp335_;
 #line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_bool_option (self, _tmp349_, _tmp350_, _tmp351_, FALSE, NULL);
-#line 10340 "scanner.c"
-			}
-#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp352_ = self->priv->handle;
-#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp354_ = scanner_get_option_by_name (self, _tmp352_, "test-picture", &_tmp353_);
+			option = _tmp336_;
 #line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp353_;
+			_tmp337_ = option;
 #line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp354_;
+			if (_tmp337_ != NULL) {
+#line 10419 "scanner.c"
+				SANE_Handle _tmp338_ = {0};
+				SANE_Option_Descriptor* _tmp339_ = NULL;
+				SANE_Int _tmp340_ = {0};
 #line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp355_ = option;
+				_tmp338_ = self->priv->handle;
 #line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp355_ != NULL) {
-#line 10354 "scanner.c"
-				SANE_Handle _tmp356_;
-				SANE_Option_Descriptor* _tmp357_;
-				SANE_Int _tmp358_;
+				_tmp339_ = option;
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp340_ = index;
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_string_option (self, _tmp338_, _tmp339_, _tmp340_, "Color pattern", NULL);
+#line 10431 "scanner.c"
+			}
 #line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp356_ = self->priv->handle;
+			_tmp341_ = self->priv->handle;
 #line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp357_ = option;
+			_tmp343_ = scanner_get_option_by_name (self, _tmp341_, "read-delay", &_tmp342_);
 #line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp358_ = index;
+			index = (SANE_Int) _tmp342_;
 #line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_string_option (self, _tmp356_, _tmp357_, _tmp358_, "Color pattern", NULL);
-#line 10366 "scanner.c"
-			}
+			option = _tmp343_;
 #line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp359_ = self->priv->handle;
+			_tmp344_ = option;
 #line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp361_ = scanner_get_option_by_name (self, _tmp359_, "read-delay", &_tmp360_);
-#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp360_;
-#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp361_;
+			if (_tmp344_ != NULL) {
+#line 10445 "scanner.c"
+				SANE_Handle _tmp345_ = {0};
+				SANE_Option_Descriptor* _tmp346_ = NULL;
+				SANE_Int _tmp347_ = {0};
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp345_ = self->priv->handle;
 #line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp362_ = option;
+				_tmp346_ = option;
 #line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp362_ != NULL) {
-#line 10380 "scanner.c"
-				SANE_Handle _tmp363_;
-				SANE_Option_Descriptor* _tmp364_;
-				SANE_Int _tmp365_;
+				_tmp347_ = index;
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				scanner_set_bool_option (self, _tmp345_, _tmp346_, _tmp347_, TRUE, NULL);
+#line 10457 "scanner.c"
+			}
 #line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp363_ = self->priv->handle;
+			_tmp348_ = self->priv->handle;
 #line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp364_ = option;
+			_tmp350_ = scanner_get_option_by_name (self, _tmp348_, "read-delay-duration", &_tmp349_);
 #line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp365_ = index;
+			index = (SANE_Int) _tmp349_;
 #line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_bool_option (self, _tmp363_, _tmp364_, _tmp365_, TRUE, NULL);
-#line 10392 "scanner.c"
-			}
+			option = _tmp350_;
 #line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp366_ = self->priv->handle;
+			_tmp351_ = option;
 #line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp368_ = scanner_get_option_by_name (self, _tmp366_, "read-delay-duration", &_tmp367_);
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp367_;
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp368_;
+			if (_tmp351_ != NULL) {
+#line 10471 "scanner.c"
+				SANE_Handle _tmp352_ = {0};
+				SANE_Option_Descriptor* _tmp353_ = NULL;
+				SANE_Int _tmp354_ = {0};
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp352_ = self->priv->handle;
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				_tmp353_ = option;
 #line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp369_ = option;
+				_tmp354_ = index;
 #line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp369_ != NULL) {
-#line 10406 "scanner.c"
-				SANE_Handle _tmp370_;
-				SANE_Option_Descriptor* _tmp371_;
-				SANE_Int _tmp372_;
-#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp370_ = self->priv->handle;
-#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp371_ = option;
-#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp372_ = index;
-#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_int_option (self, _tmp370_, _tmp371_, _tmp372_, 200000, NULL);
-#line 10418 "scanner.c"
+				scanner_set_int_option (self, _tmp352_, _tmp353_, _tmp354_, 200000, NULL);
+#line 10483 "scanner.c"
 			}
 		}
-#line 1137 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_START;
-#line 1138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10427 "scanner.c"
-	}
-#line 1141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp373_ = index;
-#line 1141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp374_ = option;
-#line 1141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_log_option (self, _tmp373_, _tmp374_);
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp375_ = option;
+#line 10492 "scanner.c"
+	}
+#line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp355_ = index;
+#line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp356_ = option;
+#line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	scanner_log_option (self, _tmp355_, _tmp356_);
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp357_ = option;
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp358_ = _tmp357_->type;
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp358_ == SANE_TYPE_GROUP) {
 #line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp376_ = _tmp375_->type;
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp376_ == SANE_TYPE_GROUP) {
-#line 1145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10445 "scanner.c"
-	}
+#line 10510 "scanner.c"
+	}
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp359_ = option;
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp360_ = _tmp359_->cap;
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if ((_tmp360_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
 #line 1148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp377_ = option;
-#line 1148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp378_ = _tmp377_->cap;
-#line 1148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if ((_tmp378_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
-#line 1149 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1149 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10457 "scanner.c"
-	}
-#line 1152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp379_ = option;
+#line 10522 "scanner.c"
+	}
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp361_ = option;
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp362_ = _tmp361_->name;
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp362_ == NULL) {
 #line 1152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp380_ = _tmp379_->name;
-#line 1152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp380_ == NULL) {
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10469 "scanner.c"
-	}
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp381_ = self->priv->options;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp382_ = option;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp383_ = _tmp382_->name;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp384_ = g_strdup (_tmp383_);
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp385_ = index;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_hash_table_insert (_tmp381_, _tmp384_, (gpointer) ((gintptr) ((gint) _tmp385_)));
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 10534 "scanner.c"
+	}
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp363_ = self->priv->options;
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp364_ = option;
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp365_ = _tmp364_->name;
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp366_ = g_strdup (_tmp365_);
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp367_ = index;
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_hash_table_insert (_tmp363_, _tmp366_, (gpointer) ((gintptr) ((gint) _tmp367_)));
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 10485 "scanner.c"
+#line 10550 "scanner.c"
+}
+
+
+static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor* option, gdouble size, gdouble dpi) {
+	gdouble result = 0.0;
+	SANE_Option_Descriptor* _tmp0_ = NULL;
+	SANE_Unit _tmp1_ = 0;
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_return_val_if_fail (self != NULL, 0.0);
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_return_val_if_fail (option != NULL, 0.0);
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp0_ = option;
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	_tmp1_ = _tmp0_->unit;
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	if (_tmp1_ == SANE_UNIT_PIXEL) {
+#line 10568 "scanner.c"
+		gdouble _tmp2_ = 0.0;
+		gdouble _tmp3_ = 0.0;
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp2_ = dpi;
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp3_ = size;
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		result = (_tmp2_ * _tmp3_) / 254.0;
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		return result;
+#line 10579 "scanner.c"
+	} else {
+		SANE_Option_Descriptor* _tmp4_ = NULL;
+		SANE_Unit _tmp5_ = 0;
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp4_ = option;
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp5_ = _tmp4_->unit;
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		if (_tmp5_ == SANE_UNIT_MM) {
+#line 10589 "scanner.c"
+			gdouble _tmp6_ = 0.0;
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			_tmp6_ = size;
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			result = _tmp6_ / 10.0;
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			return result;
+#line 10597 "scanner.c"
+		} else {
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_warning ("scanner.vala:1165: Unable to set unsupported unit type");
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			result = (gdouble) 0.0f;
+#line 1166 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			return result;
+#line 10605 "scanner.c"
+		}
+	}
 }
 
 
 static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_Handle handle, const gchar* name, gint* index) {
 	gint _vala_index = 0;
 	SANE_Option_Descriptor* result = NULL;
-	GHashTable* _tmp0_;
-	const gchar* _tmp1_;
+	GHashTable* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
 	gconstpointer _tmp2_ = NULL;
-	gint _tmp3_;
-	SANE_Handle _tmp4_;
-	gint _tmp5_;
+	gint _tmp3_ = 0;
+	SANE_Handle _tmp4_ = {0};
+	gint _tmp5_ = 0;
 	SANE_Option_Descriptor* _tmp6_ = NULL;
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->options;
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = name;
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_hash_table_lookup (_tmp0_, _tmp1_);
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1172 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_index = (gint) ((gintptr) _tmp2_);
-#line 1161 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _vala_index;
-#line 1161 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp3_ == 0) {
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = NULL;
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (index) {
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			*index = _vala_index;
-#line 10521 "scanner.c"
+#line 10643 "scanner.c"
 		}
-#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 10525 "scanner.c"
+#line 10647 "scanner.c"
 	}
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = handle;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _vala_index;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = sane_get_option_descriptor (_tmp4_, (SANE_Int) _tmp5_);
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp6_;
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (index) {
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*index = _vala_index;
-#line 10539 "scanner.c"
+#line 10661 "scanner.c"
 	}
-#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 10543 "scanner.c"
+#line 10665 "scanner.c"
 }
 
 
 static void scanner_do_complete_document (Scanner* self) {
-	SANE_Handle _tmp0_;
-	GList* _tmp1_;
-	GList* _tmp2_;
-	NotifyDocumentDone* _tmp3_;
-	NotifyDocumentDone* _tmp4_;
-#line 1167 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	SANE_Handle _tmp0_ = {0};
+	GList* _tmp1_ = NULL;
+	GList* _tmp2_ = NULL;
+	NotifyDocumentDone* _tmp3_ = NULL;
+	NotifyDocumentDone* _tmp4_ = NULL;
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->handle;
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	sane_cancel (_tmp0_);
-#line 1170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1170: sane_cancel ()");
-#line 1172 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1182: sane_cancel ()");
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->job_queue;
-#line 1172 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_queue = g_list_remove_link (self->priv->job_queue, _tmp1_);
-#line 1174 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
-#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->job_queue;
-#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_ != NULL) {
-#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_OPEN;
-#line 1180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10575 "scanner.c"
+#line 10697 "scanner.c"
 	}
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = notify_document_done_new ();
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_;
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp4_);
-#line 1186 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp4_);
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1199 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
-#line 10587 "scanner.c"
+#line 10709 "scanner.c"
 }
 
 
 static void scanner_do_start (Scanner* self) {
 	SANE_Status status = 0;
-	NotifyExpectPage* _tmp0_;
-	NotifyExpectPage* _tmp1_;
-	SANE_Handle _tmp2_;
+	NotifyExpectPage* _tmp0_ = NULL;
+	NotifyExpectPage* _tmp1_ = NULL;
+	SANE_Handle _tmp2_ = {0};
 	SANE_Status _tmp3_ = 0;
-	gint _tmp4_;
-	gint _tmp5_;
-	SANE_Status _tmp6_;
+	gint _tmp4_ = 0;
+	gint _tmp5_ = 0;
+	SANE_Status _tmp6_ = 0;
 	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_;
-	SANE_Status _tmp9_;
-#line 1190 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gchar* _tmp8_ = NULL;
+	SANE_Status _tmp9_ = 0;
+#line 1202 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = notify_expect_page_new ();
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_;
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp1_);
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp1_);
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->handle;
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = sane_start (_tmp2_);
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp3_;
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->page_number;
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->pass_number;
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = status;
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = sane_status_to_string (_tmp6_);
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_;
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1197: sane_start (page=%d, pass=%d) -> %s", _tmp4_, _tmp5_, _tmp8_);
-#line 1197 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1209: sane_start (page=%d, pass=%d) -> %s", _tmp4_, _tmp5_, _tmp8_);
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp8_);
-#line 1198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = status;
-#line 1198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ == SANE_STATUS_GOOD) {
-#line 1199 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_GET_PARAMETERS;
-#line 10639 "scanner.c"
+#line 10761 "scanner.c"
 	} else {
-		SANE_Status _tmp10_;
-#line 1200 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		SANE_Status _tmp10_ = 0;
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = status;
-#line 1200 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp10_ == SANE_STATUS_NO_DOCS) {
-#line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_do_complete_document (self);
-#line 10648 "scanner.c"
+#line 10770 "scanner.c"
 		} else {
-			SANE_Status _tmp11_;
+			SANE_Status _tmp11_ = 0;
 			const gchar* _tmp12_ = NULL;
-			SANE_Status _tmp13_;
+			SANE_Status _tmp13_ = 0;
 			const gchar* _tmp14_ = NULL;
-#line 1204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp11_ = status;
-#line 1204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp12_ = sane_strstatus (_tmp11_);
-#line 1204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_warning ("scanner.vala:1204: Unable to start device: %s", _tmp12_);
-#line 1205 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_warning ("scanner.vala:1216: Unable to start device: %s", _tmp12_);
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp13_ = status;
-#line 1205 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp14_ = _ ("Unable to start scan");
-#line 1205 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_fail_scan (self, (gint) _tmp13_, _tmp14_);
-#line 10666 "scanner.c"
+#line 10788 "scanner.c"
 		}
 	}
 }
@@ -10677,79 +10800,79 @@ static void scanner_do_start (Scanner* self) {
 
 static gchar* sane_frame_to_string (SANE_Frame frame) {
 	gchar* result = NULL;
-	SANE_Frame _tmp0_;
+	SANE_Frame _tmp0_ = 0;
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	_tmp0_ = frame;
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	switch (_tmp0_) {
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GRAY:
-#line 10681 "scanner.c"
+#line 10803 "scanner.c"
 		{
-			gchar* _tmp1_;
+			gchar* _tmp1_ = NULL;
 #line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp1_ = g_strdup ("SANE_FRAME_GRAY");
 #line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp1_;
 #line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10690 "scanner.c"
+#line 10812 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RGB:
-#line 10694 "scanner.c"
+#line 10816 "scanner.c"
 		{
-			gchar* _tmp2_;
+			gchar* _tmp2_ = NULL;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp2_ = g_strdup ("SANE_FRAME_RGB");
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp2_;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10703 "scanner.c"
+#line 10825 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RED:
-#line 10707 "scanner.c"
+#line 10829 "scanner.c"
 		{
-			gchar* _tmp3_;
+			gchar* _tmp3_ = NULL;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp3_ = g_strdup ("SANE_FRAME_RED");
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp3_;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10716 "scanner.c"
+#line 10838 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GREEN:
-#line 10720 "scanner.c"
+#line 10842 "scanner.c"
 		{
-			gchar* _tmp4_;
+			gchar* _tmp4_ = NULL;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp4_ = g_strdup ("SANE_FRAME_GREEN");
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp4_;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10729 "scanner.c"
+#line 10851 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_BLUE:
-#line 10733 "scanner.c"
+#line 10855 "scanner.c"
 		{
-			gchar* _tmp5_;
+			gchar* _tmp5_ = NULL;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp5_ = g_strdup ("SANE_FRAME_BLUE");
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp5_;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10742 "scanner.c"
+#line 10864 "scanner.c"
 		}
 		default:
 		{
-			SANE_Frame _tmp6_;
+			SANE_Frame _tmp6_ = 0;
 			gchar* _tmp7_ = NULL;
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp6_ = frame;
@@ -10759,1787 +10882,1787 @@ 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 10756 "scanner.c"
+#line 10878 "scanner.c"
 		}
 	}
 }
 
 
 static void scanner_do_get_parameters (Scanner* self) {
-	SANE_Handle _tmp0_;
+	SANE_Status status = 0;
+	SANE_Handle _tmp0_ = {0};
 	SANE_Parameters _tmp1_ = {0};
 	SANE_Status _tmp2_ = 0;
-	SANE_Status status;
-	SANE_Status _tmp3_;
+	SANE_Status _tmp3_ = 0;
 	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_;
-	SANE_Status _tmp6_;
-	GList* _tmp11_;
-	gconstpointer _tmp12_;
-	ScanJob* _tmp13_;
-	ScanJob* job;
+	gchar* _tmp5_ = NULL;
+	SANE_Status _tmp6_ = 0;
+	ScanJob* job = NULL;
+	GList* _tmp11_ = NULL;
+	gconstpointer _tmp12_ = NULL;
+	ScanJob* _tmp13_ = NULL;
 	const gchar* _tmp14_ = NULL;
-	SANE_Parameters _tmp15_;
-	gboolean _tmp16_;
-	SANE_Parameters _tmp17_;
-	SANE_Frame _tmp18_;
+	SANE_Parameters _tmp15_ = {0};
+	gboolean _tmp16_ = FALSE;
+	SANE_Parameters _tmp17_ = {0};
+	SANE_Frame _tmp18_ = 0;
 	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_;
-	const gchar* _tmp21_;
-	SANE_Parameters _tmp22_;
-	gint _tmp23_;
-	SANE_Parameters _tmp24_;
-	gint _tmp25_;
-	SANE_Parameters _tmp26_;
-	gint _tmp27_;
-	SANE_Parameters _tmp28_;
-	gint _tmp29_;
-	ScanPageInfo* _tmp30_;
-	ScanPageInfo* info;
-	ScanPageInfo* _tmp31_;
-	SANE_Parameters _tmp32_;
-	gint _tmp33_;
-	ScanPageInfo* _tmp34_;
-	SANE_Parameters _tmp35_;
-	gint _tmp36_;
-	ScanPageInfo* _tmp37_;
-	SANE_Parameters _tmp38_;
-	gint _tmp39_;
+	gchar* _tmp20_ = NULL;
+	const gchar* _tmp21_ = NULL;
+	SANE_Parameters _tmp22_ = {0};
+	gint _tmp23_ = 0;
+	SANE_Parameters _tmp24_ = {0};
+	gint _tmp25_ = 0;
+	SANE_Parameters _tmp26_ = {0};
+	gint _tmp27_ = 0;
+	SANE_Parameters _tmp28_ = {0};
+	gint _tmp29_ = 0;
+	ScanPageInfo* info = NULL;
+	ScanPageInfo* _tmp30_ = NULL;
+	ScanPageInfo* _tmp31_ = NULL;
+	SANE_Parameters _tmp32_ = {0};
+	gint _tmp33_ = 0;
+	ScanPageInfo* _tmp34_ = NULL;
+	SANE_Parameters _tmp35_ = {0};
+	gint _tmp36_ = 0;
+	ScanPageInfo* _tmp37_ = NULL;
+	SANE_Parameters _tmp38_ = {0};
+	gint _tmp39_ = 0;
 	gboolean _tmp40_ = FALSE;
 	gboolean _tmp41_ = FALSE;
 	gboolean _tmp42_ = FALSE;
-	SANE_Parameters _tmp43_;
-	gint _tmp44_;
-	gboolean _tmp47_;
-	gboolean _tmp50_;
-	gboolean _tmp53_;
+	SANE_Parameters _tmp43_ = {0};
+	gint _tmp44_ = 0;
+	gboolean _tmp47_ = FALSE;
+	gboolean _tmp50_ = FALSE;
+	gboolean _tmp53_ = FALSE;
 	gint _tmp57_ = 0;
-	SANE_Parameters _tmp58_;
-	SANE_Frame _tmp59_;
-	ScanPageInfo* _tmp60_;
-	gint _tmp61_;
-	ScanPageInfo* _tmp62_;
-	ScanJob* _tmp63_;
-	gdouble _tmp64_;
-	ScanPageInfo* _tmp65_;
-	const gchar* _tmp66_;
-	gchar* _tmp67_;
-	gint _tmp68_;
-	gint _tmp69_;
-	SANE_Parameters _tmp76_;
-	gint _tmp77_;
-	gint buffer_size;
-	gint _tmp78_;
+	SANE_Parameters _tmp58_ = {0};
+	SANE_Frame _tmp59_ = 0;
+	ScanPageInfo* _tmp60_ = NULL;
+	gint _tmp61_ = 0;
+	ScanPageInfo* _tmp62_ = NULL;
+	ScanJob* _tmp63_ = NULL;
+	gdouble _tmp64_ = 0.0;
+	ScanPageInfo* _tmp65_ = NULL;
+	const gchar* _tmp66_ = NULL;
+	gchar* _tmp67_ = NULL;
+	gint _tmp68_ = 0;
+	gint _tmp69_ = 0;
+	gint buffer_size = 0;
+	SANE_Parameters _tmp76_ = {0};
+	gint _tmp77_ = 0;
+	gint _tmp78_ = 0;
 	guchar* _tmp79_ = NULL;
-#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1223 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->handle;
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = sane_get_parameters (_tmp0_, &_tmp1_);
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->parameters = _tmp1_;
-#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp2_;
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = status;
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = sane_status_to_string (_tmp3_);
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_;
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1214: sane_get_parameters () -> %s", _tmp5_);
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1226: sane_get_parameters () -> %s", _tmp5_);
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp5_);
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = status;
-#line 1215 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != SANE_STATUS_GOOD) {
-#line 10852 "scanner.c"
-		SANE_Status _tmp7_;
+#line 10974 "scanner.c"
+		SANE_Status _tmp7_ = 0;
 		const gchar* _tmp8_ = NULL;
-		SANE_Status _tmp9_;
+		SANE_Status _tmp9_ = 0;
 		const gchar* _tmp10_ = NULL;
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = status;
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = sane_strstatus (_tmp7_);
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:1217: Unable to get device parameters: %s", _tmp8_);
-#line 1218 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:1229: Unable to get device parameters: %s", _tmp8_);
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = status;
-#line 1218 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = _ ("Error communicating with scanner");
-#line 1218 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp9_, _tmp10_);
-#line 1221 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10871 "scanner.c"
+#line 10993 "scanner.c"
 	}
-#line 1224 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = self->priv->job_queue;
-#line 1224 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = _tmp11_->data;
-#line 1224 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp12_, TYPE_SCAN_JOB, ScanJob));
-#line 1224 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp13_;
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = self->priv->parameters;
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = _tmp15_.last_frame;
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp16_) {
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_TRUE";
-#line 10889 "scanner.c"
+#line 11011 "scanner.c"
 	} else {
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_FALSE";
-#line 10893 "scanner.c"
+#line 11015 "scanner.c"
 	}
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = self->priv->parameters;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = _tmp17_.format;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = sane_frame_to_string (_tmp18_);
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = _tmp19_;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = _tmp14_;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = self->priv->parameters;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = _tmp22_.bytes_per_line;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = self->priv->parameters;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = _tmp24_.pixels_per_line;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = self->priv->parameters;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = _tmp26_.lines;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = self->priv->parameters;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = _tmp28_.depth;
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1226: Parameters: format=%s last_frame=%s bytes_per_line=" \
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1238: Parameters: format=%s last_frame=%s bytes_per_line=" \
 "%d pixels_per_line=%d lines=%d depth=%d", _tmp20_, _tmp21_, _tmp23_, _tmp25_, _tmp27_, _tmp29_);
-#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp20_);
-#line 1234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1246 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = scan_page_info_new ();
-#line 1234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1246 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	info = _tmp30_;
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1247 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = info;
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1247 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp32_ = self->priv->parameters;
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1247 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_ = _tmp32_.pixels_per_line;
-#line 1235 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1247 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_->width = _tmp33_;
-#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = info;
-#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = self->priv->parameters;
-#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = _tmp35_.lines;
-#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_->height = _tmp36_;
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_ = info;
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = self->priv->parameters;
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = _tmp38_.depth;
-#line 1237 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_->depth = _tmp39_;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = self->priv->parameters;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = _tmp43_.depth;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp44_ == 8) {
-#line 10959 "scanner.c"
-		SANE_Parameters _tmp45_;
-		SANE_Frame _tmp46_;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11081 "scanner.c"
+		SANE_Parameters _tmp45_ = {0};
+		SANE_Frame _tmp46_ = 0;
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp45_ = self->priv->parameters;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp46_ = _tmp45_.format;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp42_ = _tmp46_ == SANE_FRAME_GRAY;
-#line 10968 "scanner.c"
+#line 11090 "scanner.c"
 	} else {
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp42_ = FALSE;
-#line 10972 "scanner.c"
+#line 11094 "scanner.c"
 	}
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp47_ = _tmp42_;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp47_) {
-#line 10978 "scanner.c"
-		ScanJob* _tmp48_;
-		gint _tmp49_;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11100 "scanner.c"
+		ScanJob* _tmp48_ = NULL;
+		gint _tmp49_ = 0;
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp48_ = job;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp49_ = _tmp48_->depth;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = _tmp49_ == 2;
-#line 10987 "scanner.c"
+#line 11109 "scanner.c"
 	} else {
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = FALSE;
-#line 10991 "scanner.c"
+#line 11113 "scanner.c"
 	}
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp50_ = _tmp41_;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp50_) {
-#line 10997 "scanner.c"
-		ScanJob* _tmp51_;
-		ScanMode _tmp52_;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11119 "scanner.c"
+		ScanJob* _tmp51_ = NULL;
+		ScanMode _tmp52_ = 0;
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp51_ = job;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp52_ = _tmp51_->scan_mode;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = _tmp52_ == SCAN_MODE_GRAY;
-#line 11006 "scanner.c"
+#line 11128 "scanner.c"
 	} else {
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = FALSE;
-#line 11010 "scanner.c"
+#line 11132 "scanner.c"
 	}
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp53_ = _tmp40_;
-#line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp53_) {
-#line 11016 "scanner.c"
-		ScanPageInfo* _tmp54_;
-		ScanJob* _tmp55_;
-		gint _tmp56_;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11138 "scanner.c"
+		ScanPageInfo* _tmp54_ = NULL;
+		ScanJob* _tmp55_ = NULL;
+		gint _tmp56_ = 0;
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp54_ = info;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp55_ = job;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp56_ = _tmp55_->depth;
-#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp54_->depth = _tmp56_;
-#line 11028 "scanner.c"
+#line 11150 "scanner.c"
 	}
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp58_ = self->priv->parameters;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp59_ = _tmp58_.format;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp59_ == SANE_FRAME_GRAY) {
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_ = 1;
-#line 11038 "scanner.c"
+#line 11160 "scanner.c"
 	} else {
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_ = 3;
-#line 11042 "scanner.c"
+#line 11164 "scanner.c"
 	}
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp60_ = info;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp61_ = _tmp57_;
-#line 1242 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp60_->n_channels = _tmp61_;
-#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp62_ = info;
-#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp63_ = job;
-#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp64_ = _tmp63_->dpi;
-#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp62_->dpi = _tmp64_;
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp65_ = info;
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp66_ = self->priv->current_device;
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp67_ = g_strdup (_tmp66_);
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp65_->device);
-#line 1244 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp65_->device = _tmp67_;
-#line 1246 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp68_ = self->priv->page_number;
-#line 1246 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp69_ = self->priv->notified_page;
-#line 1246 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp68_ != _tmp69_) {
-#line 11074 "scanner.c"
-		ScanJob* _tmp70_;
-		gint _tmp71_;
-		ScanPageInfo* _tmp72_;
-		NotifyGotPageInfo* _tmp73_;
-		NotifyGotPageInfo* _tmp74_;
-		gint _tmp75_;
-#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11196 "scanner.c"
+		ScanJob* _tmp70_ = NULL;
+		gint _tmp71_ = 0;
+		ScanPageInfo* _tmp72_ = NULL;
+		NotifyGotPageInfo* _tmp73_ = NULL;
+		NotifyGotPageInfo* _tmp74_ = NULL;
+		gint _tmp75_ = 0;
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp70_ = job;
-#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp71_ = _tmp70_->id;
-#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp72_ = info;
-#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp73_ = notify_got_page_info_new (_tmp71_, _tmp72_);
-#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp74_ = _tmp73_;
-#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp74_);
-#line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp74_);
-#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp75_ = self->priv->page_number;
-#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->notified_page = _tmp75_;
-#line 11099 "scanner.c"
+#line 11221 "scanner.c"
 	}
-#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp76_ = self->priv->parameters;
-#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp77_ = _tmp76_.bytes_per_line;
-#line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	buffer_size = _tmp77_ + 1;
-#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp78_ = buffer_size;
-#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp79_ = g_new0 (guchar, _tmp78_);
-#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = _tmp79_;
-#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer_length1 = _tmp78_;
-#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->_buffer_size_ = self->priv->buffer_length1;
-#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->n_used = 0;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->line_count = 0;
-#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->pass_number = 0;
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_READ;
-#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1223 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_page_info_unref0 (info);
-#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1223 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 11131 "scanner.c"
+#line 11253 "scanner.c"
 }
 
 
 static void scanner_do_complete_page (Scanner* self) {
-	GList* _tmp0_;
-	gconstpointer _tmp1_;
-	ScanJob* _tmp2_;
-	ScanJob* job;
-	ScanJob* _tmp3_;
-	gint _tmp4_;
-	NotifyPageDone* _tmp5_;
-	NotifyPageDone* _tmp6_;
-	SANE_Parameters _tmp7_;
-	gboolean _tmp8_;
-	ScanJob* _tmp10_;
-	ScanType _tmp11_;
-#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	ScanJob* job = NULL;
+	GList* _tmp0_ = NULL;
+	gconstpointer _tmp1_ = NULL;
+	ScanJob* _tmp2_ = NULL;
+	ScanJob* _tmp3_ = NULL;
+	gint _tmp4_ = 0;
+	NotifyPageDone* _tmp5_ = NULL;
+	NotifyPageDone* _tmp6_ = NULL;
+	SANE_Parameters _tmp7_ = {0};
+	gboolean _tmp8_ = FALSE;
+	ScanJob* _tmp10_ = NULL;
+	ScanType _tmp11_ = 0;
+#line 1273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = job;
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->id;
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = notify_page_done_new (_tmp4_);
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = _tmp5_;
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp6_);
-#line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp6_);
-#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = self->priv->parameters;
-#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_.last_frame;
-#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!_tmp8_) {
-#line 11176 "scanner.c"
-		gint _tmp9_;
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11298 "scanner.c"
+		gint _tmp9_ = 0;
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->pass_number;
-#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->pass_number = _tmp9_ + 1;
-#line 1271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_START;
-#line 1272 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1272 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11188 "scanner.c"
+#line 11310 "scanner.c"
 	}
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = job;
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = _tmp10_->type;
-#line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp11_ != SCAN_TYPE_SINGLE) {
-#line 11196 "scanner.c"
-		gint _tmp12_;
-		ScanJob* _tmp13_;
-		gint _tmp14_;
-		NotifyPageDone* _tmp15_;
-		NotifyPageDone* _tmp16_;
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11318 "scanner.c"
+		gint _tmp12_ = 0;
+		ScanJob* _tmp13_ = NULL;
+		gint _tmp14_ = 0;
+		NotifyPageDone* _tmp15_ = NULL;
+		NotifyPageDone* _tmp16_ = NULL;
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = self->priv->page_number;
-#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1290 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->page_number = _tmp12_ + 1;
-#line 1279 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1291 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->pass_number = 0;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = job;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = _tmp13_->id;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = notify_page_done_new (_tmp14_);
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = _tmp15_;
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp16_);
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp16_);
-#line 1281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_START;
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11226 "scanner.c"
+#line 11348 "scanner.c"
 	}
-#line 1285 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_do_complete_document (self);
-#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 11232 "scanner.c"
+#line 11354 "scanner.c"
 }
 
 
 static void scanner_do_read (Scanner* self) {
-	GList* _tmp0_;
-	gconstpointer _tmp1_;
-	ScanJob* _tmp2_;
-	ScanJob* job;
-	guchar* _tmp3_;
-	gint _tmp3__length1;
-	gint _tmp4_;
-	gint n_to_read;
+	ScanJob* job = NULL;
+	GList* _tmp0_ = NULL;
+	gconstpointer _tmp1_ = NULL;
+	ScanJob* _tmp2_ = NULL;
+	gint n_to_read = 0;
+	guchar* _tmp3_ = NULL;
+	gint _tmp3__length1 = 0;
+	gint _tmp4_ = 0;
 	SANE_Int n_read = {0};
-	guchar* _tmp5_;
-	gint _tmp5__length1;
-	guchar* b;
-	SANE_Handle _tmp6_;
-	guchar* _tmp7_;
-	gint _tmp8_;
-	gint _tmp9_;
+	guchar* b = NULL;
+	guchar* _tmp5_ = NULL;
+	gint _tmp5__length1 = 0;
+	SANE_Status status = 0;
+	SANE_Handle _tmp6_ = {0};
+	guchar* _tmp7_ = NULL;
+	gint _tmp8_ = 0;
+	gint _tmp9_ = 0;
 	SANE_Int _tmp10_ = {0};
 	SANE_Status _tmp11_ = 0;
-	SANE_Status status;
-	gint _tmp12_;
-	SANE_Status _tmp13_;
+	gint _tmp12_ = 0;
+	SANE_Status _tmp13_ = 0;
 	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_;
-	SANE_Int _tmp16_;
-	SANE_Status _tmp17_;
-	SANE_Status _tmp30_;
-	gboolean full_read;
+	gchar* _tmp15_ = NULL;
+	SANE_Int _tmp16_ = {0};
+	SANE_Status _tmp17_ = 0;
+	SANE_Status _tmp30_ = 0;
+	gboolean full_read = FALSE;
 	gboolean _tmp35_ = FALSE;
-	gint _tmp36_;
-	gboolean _tmp39_;
-	gint _tmp40_;
-	SANE_Int _tmp41_;
-	gint _tmp42_;
-	SANE_Parameters _tmp43_;
-	gint _tmp44_;
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gint _tmp36_ = 0;
+	gboolean _tmp39_ = FALSE;
+	gint _tmp40_ = 0;
+	SANE_Int _tmp41_ = {0};
+	gint _tmp42_ = 0;
+	SANE_Parameters _tmp43_ = {0};
+	gint _tmp44_ = 0;
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = self->priv->buffer;
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3__length1 = self->priv->buffer_length1;
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->n_used;
-#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	n_to_read = _tmp3__length1 - _tmp4_;
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->buffer;
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5__length1 = self->priv->buffer_length1;
-#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	b = (guchar*) _tmp5_;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = self->priv->handle;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = b;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = self->priv->n_used;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = n_to_read;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = sane_read (_tmp6_, (guint8*) (_tmp7_ + _tmp8_), (SANE_Int) _tmp9_, &_tmp10_);
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	n_read = _tmp10_;
-#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp11_;
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = n_to_read;
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = status;
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = sane_status_to_string (_tmp13_);
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = _tmp14_;
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = n_read;
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1298: sane_read (%d) -> (%s, %d)", _tmp12_, _tmp15_, (gint) _tmp16_);
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1310: sane_read (%d) -> (%s, %d)", _tmp12_, _tmp15_, (gint) _tmp16_);
+#line 1310 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp15_);
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = status;
-#line 1301 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp17_ == SANE_STATUS_EOF) {
-#line 11328 "scanner.c"
+#line 11450 "scanner.c"
 		gboolean _tmp18_ = FALSE;
-		SANE_Parameters _tmp19_;
-		gint _tmp20_;
-		gboolean _tmp24_;
-		gint _tmp28_;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		SANE_Parameters _tmp19_ = {0};
+		gint _tmp20_ = 0;
+		gboolean _tmp24_ = FALSE;
+		gint _tmp28_ = 0;
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = self->priv->parameters;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp20_ = _tmp19_.lines;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ > 0) {
-#line 11340 "scanner.c"
-			gint _tmp21_;
-			SANE_Parameters _tmp22_;
-			gint _tmp23_;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11462 "scanner.c"
+			gint _tmp21_ = 0;
+			SANE_Parameters _tmp22_ = {0};
+			gint _tmp23_ = 0;
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = self->priv->line_count;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = self->priv->parameters;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = _tmp22_.lines;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = _tmp21_ != _tmp23_;
-#line 11352 "scanner.c"
+#line 11474 "scanner.c"
 		} else {
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = FALSE;
-#line 11356 "scanner.c"
+#line 11478 "scanner.c"
 		}
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp24_ = _tmp18_;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp24_) {
-#line 11362 "scanner.c"
-			gint _tmp25_;
-			SANE_Parameters _tmp26_;
-			gint _tmp27_;
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11484 "scanner.c"
+			gint _tmp25_ = 0;
+			SANE_Parameters _tmp26_ = {0};
+			gint _tmp27_ = 0;
+#line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = self->priv->line_count;
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp26_ = self->priv->parameters;
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp27_ = _tmp26_.lines;
-#line 1304 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_warning ("scanner.vala:1304: Scan completed with %d lines, expected %d lines", _tmp25_, _tmp27_);
-#line 11374 "scanner.c"
+#line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_warning ("scanner.vala:1316: Scan completed with %d lines, expected %d lines", _tmp25_, _tmp27_);
+#line 11496 "scanner.c"
 		}
-#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp28_ = self->priv->n_used;
-#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp28_ > 0) {
-#line 11380 "scanner.c"
-			gint _tmp29_;
-#line 1306 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11502 "scanner.c"
+			gint _tmp29_ = 0;
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_ = self->priv->n_used;
-#line 1306 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_warning ("scanner.vala:1306: Scan complete with %d bytes of unused data", _tmp29_);
-#line 11386 "scanner.c"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			g_warning ("scanner.vala:1318: Scan complete with %d bytes of unused data", _tmp29_);
+#line 11508 "scanner.c"
 		}
-#line 1307 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_do_complete_page (self);
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11394 "scanner.c"
+#line 11516 "scanner.c"
 	}
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = status;
-#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp30_ != SANE_STATUS_GOOD) {
-#line 11400 "scanner.c"
-		SANE_Status _tmp31_;
+#line 11522 "scanner.c"
+		SANE_Status _tmp31_ = 0;
 		const gchar* _tmp32_ = NULL;
-		SANE_Status _tmp33_;
+		SANE_Status _tmp33_ = 0;
 		const gchar* _tmp34_ = NULL;
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp31_ = status;
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp32_ = sane_strstatus (_tmp31_);
-#line 1314 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:1314: Unable to read frame from device: %s", _tmp32_);
-#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:1326: Unable to read frame from device: %s", _tmp32_);
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp33_ = status;
-#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = _ ("Error communicating with scanner");
-#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp33_, _tmp34_);
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11421 "scanner.c"
+#line 11543 "scanner.c"
 	}
-#line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	full_read = FALSE;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = self->priv->n_used;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp36_ == 0) {
-#line 11429 "scanner.c"
-		SANE_Int _tmp37_;
-		guchar* _tmp38_;
-		gint _tmp38__length1;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11551 "scanner.c"
+		SANE_Int _tmp37_ = {0};
+		guchar* _tmp38_ = NULL;
+		gint _tmp38__length1 = 0;
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp37_ = n_read;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp38_ = self->priv->buffer;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp38__length1 = self->priv->buffer_length1;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp35_ = _tmp37_ == ((SANE_Int) _tmp38__length1);
-#line 11441 "scanner.c"
+#line 11563 "scanner.c"
 	} else {
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp35_ = FALSE;
-#line 11445 "scanner.c"
+#line 11567 "scanner.c"
 	}
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = _tmp35_;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp39_) {
-#line 1323 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1335 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		full_read = TRUE;
-#line 11453 "scanner.c"
+#line 11575 "scanner.c"
 	}
-#line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_ = self->priv->n_used;
-#line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = n_read;
-#line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->n_used = _tmp40_ + ((gint) _tmp41_);
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = self->priv->n_used;
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = self->priv->parameters;
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = _tmp43_.bytes_per_line;
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp42_ >= _tmp44_) {
-#line 11469 "scanner.c"
-		ScanLine* _tmp45_;
-		ScanLine* line;
-		SANE_Parameters _tmp46_;
-		SANE_Frame _tmp47_;
-		ScanLine* _tmp53_;
-		SANE_Parameters _tmp54_;
-		gint _tmp55_;
-		ScanLine* _tmp56_;
-		SANE_Parameters _tmp57_;
-		gint _tmp58_;
-		ScanLine* _tmp59_;
-		guchar* _tmp60_;
-		gint _tmp60__length1;
-		ScanLine* _tmp61_;
-		SANE_Parameters _tmp62_;
-		gint _tmp63_;
-		ScanLine* _tmp64_;
-		gint _tmp65_;
-		ScanLine* _tmp66_;
-		gint _tmp67_;
-		ScanLine* _tmp68_;
-		gint _tmp69_;
-		gint _tmp70_;
-		ScanLine* _tmp71_;
-		gint _tmp72_;
-		guchar* _tmp73_;
-		gint _tmp73__length1;
-		gint buffer_size;
-		gboolean _tmp74_;
-		gint _tmp78_;
+#line 11591 "scanner.c"
+		ScanLine* line = NULL;
+		ScanLine* _tmp45_ = NULL;
+		SANE_Parameters _tmp46_ = {0};
+		SANE_Frame _tmp47_ = 0;
+		ScanLine* _tmp53_ = NULL;
+		SANE_Parameters _tmp54_ = {0};
+		gint _tmp55_ = 0;
+		ScanLine* _tmp56_ = NULL;
+		SANE_Parameters _tmp57_ = {0};
+		gint _tmp58_ = 0;
+		ScanLine* _tmp59_ = NULL;
+		guchar* _tmp60_ = NULL;
+		gint _tmp60__length1 = 0;
+		ScanLine* _tmp61_ = NULL;
+		SANE_Parameters _tmp62_ = {0};
+		gint _tmp63_ = 0;
+		ScanLine* _tmp64_ = NULL;
+		gint _tmp65_ = 0;
+		ScanLine* _tmp66_ = NULL;
+		gint _tmp67_ = 0;
+		ScanLine* _tmp68_ = NULL;
+		gint _tmp69_ = 0;
+		gint _tmp70_ = 0;
+		ScanLine* _tmp71_ = NULL;
+		gint _tmp72_ = 0;
+		gint buffer_size = 0;
+		guchar* _tmp73_ = NULL;
+		gint _tmp73__length1 = 0;
+		gboolean _tmp74_ = FALSE;
+		gint _tmp78_ = 0;
 		guchar* _tmp79_ = NULL;
-		gint _tmp80_;
-		ScanLine* _tmp81_;
-		gint _tmp82_;
-		ScanLine* _tmp83_;
-		gint _tmp84_;
-		gint n_remaining;
+		gint n_remaining = 0;
+		gint _tmp80_ = 0;
+		ScanLine* _tmp81_ = NULL;
+		gint _tmp82_ = 0;
+		ScanLine* _tmp83_ = NULL;
+		gint _tmp84_ = 0;
 		gboolean _tmp102_ = FALSE;
 		gboolean _tmp103_ = FALSE;
 		gboolean _tmp104_ = FALSE;
-		SANE_Parameters _tmp105_;
-		gint _tmp106_;
-		gboolean _tmp109_;
-		gboolean _tmp112_;
-		gboolean _tmp115_;
-		ScanJob* _tmp160_;
-		gint _tmp161_;
-		ScanLine* _tmp162_;
-		NotifyGotLine* _tmp163_;
-		NotifyGotLine* _tmp164_;
-#line 1329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		SANE_Parameters _tmp105_ = {0};
+		gint _tmp106_ = 0;
+		gboolean _tmp109_ = FALSE;
+		gboolean _tmp112_ = FALSE;
+		gboolean _tmp115_ = FALSE;
+		ScanJob* _tmp160_ = NULL;
+		gint _tmp161_ = 0;
+		ScanLine* _tmp162_ = NULL;
+		NotifyGotLine* _tmp163_ = NULL;
+		NotifyGotLine* _tmp164_ = NULL;
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp45_ = scan_line_new ();
-#line 1329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		line = _tmp45_;
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp46_ = self->priv->parameters;
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp47_ = _tmp46_.format;
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		switch (_tmp47_) {
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GRAY:
-#line 11532 "scanner.c"
+#line 11654 "scanner.c"
 			{
-				ScanLine* _tmp48_;
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				ScanLine* _tmp48_ = NULL;
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp48_ = line;
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp48_->channel = 0;
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11541 "scanner.c"
+#line 11663 "scanner.c"
 			}
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RGB:
-#line 11545 "scanner.c"
+#line 11667 "scanner.c"
 			{
-				ScanLine* _tmp49_;
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				ScanLine* _tmp49_ = NULL;
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp49_ = line;
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp49_->channel = -1;
-#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11554 "scanner.c"
+#line 11676 "scanner.c"
 			}
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RED:
-#line 11558 "scanner.c"
+#line 11680 "scanner.c"
 			{
-				ScanLine* _tmp50_;
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				ScanLine* _tmp50_ = NULL;
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp50_ = line;
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp50_->channel = 0;
-#line 1340 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11567 "scanner.c"
+#line 11689 "scanner.c"
 			}
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GREEN:
-#line 11571 "scanner.c"
+#line 11693 "scanner.c"
 			{
-				ScanLine* _tmp51_;
-#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				ScanLine* _tmp51_ = NULL;
+#line 1354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp51_ = line;
-#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp51_->channel = 1;
-#line 1343 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11580 "scanner.c"
+#line 11702 "scanner.c"
 			}
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_BLUE:
-#line 11584 "scanner.c"
+#line 11706 "scanner.c"
 			{
-				ScanLine* _tmp52_;
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				ScanLine* _tmp52_ = NULL;
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp52_ = line;
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp52_->channel = 2;
-#line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11593 "scanner.c"
+#line 11715 "scanner.c"
 			}
 			default:
-#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 11598 "scanner.c"
+#line 11720 "scanner.c"
 		}
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = line;
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp54_ = self->priv->parameters;
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp55_ = _tmp54_.pixels_per_line;
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_->width = _tmp55_;
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp56_ = line;
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_ = self->priv->parameters;
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp58_ = _tmp57_.depth;
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp56_->depth = _tmp58_;
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_ = line;
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp60_ = self->priv->buffer;
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp60__length1 = self->priv->buffer_length1;
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = NULL;
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_->data = (g_free (_tmp59_->data), NULL);
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_->data = _tmp60_;
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_->data_length1 = _tmp60__length1;
-#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp61_ = line;
-#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp62_ = self->priv->parameters;
-#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp63_ = _tmp62_.bytes_per_line;
-#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp61_->data_length = _tmp63_;
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp64_ = line;
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp65_ = self->priv->line_count;
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp64_->number = _tmp65_;
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp66_ = line;
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp67_ = self->priv->n_used;
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp68_ = line;
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp69_ = _tmp68_->data_length;
-#line 1353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp66_->n_lines = _tmp67_ / _tmp69_;
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp70_ = self->priv->line_count;
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp71_ = line;
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp72_ = _tmp71_->n_lines;
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->line_count = _tmp70_ + _tmp72_;
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp73_ = self->priv->buffer;
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp73__length1 = self->priv->buffer_length1;
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		buffer_size = _tmp73__length1;
-#line 1359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp74_ = full_read;
-#line 1359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp74_) {
-#line 11672 "scanner.c"
-			gint _tmp75_;
-			SANE_Parameters _tmp76_;
-			gint _tmp77_;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11794 "scanner.c"
+			gint _tmp75_ = 0;
+			SANE_Parameters _tmp76_ = {0};
+			gint _tmp77_ = 0;
+#line 1372 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp75_ = buffer_size;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1372 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp76_ = self->priv->parameters;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1372 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp77_ = _tmp76_.bytes_per_line;
-#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1372 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			buffer_size = _tmp75_ + _tmp77_;
-#line 11684 "scanner.c"
+#line 11806 "scanner.c"
 		}
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp78_ = buffer_size;
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp79_ = g_new0 (guchar, _tmp78_);
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = _tmp79_;
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer_length1 = _tmp78_;
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->_buffer_size_ = self->priv->buffer_length1;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp80_ = self->priv->n_used;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp81_ = line;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp82_ = _tmp81_->n_lines;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp83_ = line;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp84_ = _tmp83_->data_length;
-#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		n_remaining = _tmp80_ - (_tmp82_ * _tmp84_);
-#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->n_used = 0;
-#line 11712 "scanner.c"
+#line 11834 "scanner.c"
 		{
-			gint i;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gint i = 0;
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			i = 0;
-#line 11717 "scanner.c"
+#line 11839 "scanner.c"
 			{
-				gboolean _tmp85_;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				gboolean _tmp85_ = FALSE;
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp85_ = TRUE;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				while (TRUE) {
-#line 11724 "scanner.c"
-					gboolean _tmp86_;
-					gint _tmp88_;
-					gint _tmp89_;
-					guchar* _tmp90_;
-					gint _tmp90__length1;
-					gint _tmp91_;
-					ScanLine* _tmp92_;
-					guchar* _tmp93_;
-					gint _tmp93__length1;
-					gint _tmp94_;
-					ScanLine* _tmp95_;
-					gint _tmp96_;
-					ScanLine* _tmp97_;
-					gint _tmp98_;
-					guchar _tmp99_;
-					guchar _tmp100_;
-					gint _tmp101_;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11846 "scanner.c"
+					gboolean _tmp86_ = FALSE;
+					gint _tmp88_ = 0;
+					gint _tmp89_ = 0;
+					guchar* _tmp90_ = NULL;
+					gint _tmp90__length1 = 0;
+					gint _tmp91_ = 0;
+					ScanLine* _tmp92_ = NULL;
+					guchar* _tmp93_ = NULL;
+					gint _tmp93__length1 = 0;
+					gint _tmp94_ = 0;
+					ScanLine* _tmp95_ = NULL;
+					gint _tmp96_ = 0;
+					ScanLine* _tmp97_ = NULL;
+					gint _tmp98_ = 0;
+					guchar _tmp99_ = '\0';
+					guchar _tmp100_ = '\0';
+					gint _tmp101_ = 0;
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp86_ = _tmp85_;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp86_) {
-#line 11746 "scanner.c"
-						gint _tmp87_;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11868 "scanner.c"
+						gint _tmp87_ = 0;
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp87_ = i;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						i = _tmp87_ + 1;
-#line 11752 "scanner.c"
+#line 11874 "scanner.c"
 					}
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp85_ = FALSE;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88_ = i;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp89_ = n_remaining;
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!(_tmp88_ < _tmp89_)) {
-#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						break;
-#line 11764 "scanner.c"
+#line 11886 "scanner.c"
 					}
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp90_ = self->priv->buffer;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp90__length1 = self->priv->buffer_length1;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp91_ = i;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp92_ = line;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp93_ = _tmp92_->data;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp93__length1 = _tmp92_->data_length1;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp94_ = i;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp95_ = line;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp96_ = _tmp95_->n_lines;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp97_ = line;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp98_ = _tmp97_->data_length;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp99_ = _tmp93_[_tmp94_ + (_tmp96_ * _tmp98_)];
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp90_[_tmp91_] = _tmp99_;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp100_ = _tmp90_[_tmp91_];
-#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp101_ = self->priv->n_used;
-#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->n_used = _tmp101_ + 1;
-#line 11798 "scanner.c"
+#line 11920 "scanner.c"
 				}
 			}
 		}
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp105_ = self->priv->parameters;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp106_ = _tmp105_.depth;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp106_ == 8) {
-#line 11808 "scanner.c"
-			SANE_Parameters _tmp107_;
-			SANE_Frame _tmp108_;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11930 "scanner.c"
+			SANE_Parameters _tmp107_ = {0};
+			SANE_Frame _tmp108_ = 0;
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp107_ = self->priv->parameters;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp108_ = _tmp107_.format;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp104_ = _tmp108_ == SANE_FRAME_GRAY;
-#line 11817 "scanner.c"
+#line 11939 "scanner.c"
 		} else {
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp104_ = FALSE;
-#line 11821 "scanner.c"
+#line 11943 "scanner.c"
 		}
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp109_ = _tmp104_;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp109_) {
-#line 11827 "scanner.c"
-			ScanJob* _tmp110_;
-			gint _tmp111_;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11949 "scanner.c"
+			ScanJob* _tmp110_ = NULL;
+			gint _tmp111_ = 0;
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp110_ = job;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp111_ = _tmp110_->depth;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_ = _tmp111_ == 2;
-#line 11836 "scanner.c"
+#line 11958 "scanner.c"
 		} else {
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_ = FALSE;
-#line 11840 "scanner.c"
+#line 11962 "scanner.c"
 		}
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp112_ = _tmp103_;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp112_) {
-#line 11846 "scanner.c"
-			ScanJob* _tmp113_;
-			ScanMode _tmp114_;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11968 "scanner.c"
+			ScanJob* _tmp113_ = NULL;
+			ScanMode _tmp114_ = 0;
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp113_ = job;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp114_ = _tmp113_->scan_mode;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = _tmp114_ == SCAN_MODE_GRAY;
-#line 11855 "scanner.c"
+#line 11977 "scanner.c"
 		} else {
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = FALSE;
-#line 11859 "scanner.c"
+#line 11981 "scanner.c"
 		}
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp115_ = _tmp102_;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp115_) {
-#line 11865 "scanner.c"
-			guchar block;
-			gint write_offset;
-			gint block_shift;
-			ScanLine* _tmp157_;
-			ScanLine* _tmp158_;
-			gint _tmp159_;
-#line 1376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 11987 "scanner.c"
+			guchar block = '\0';
+			gint write_offset = 0;
+			gint block_shift = 0;
+			ScanLine* _tmp157_ = NULL;
+			ScanLine* _tmp158_ = NULL;
+			gint _tmp159_ = 0;
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			block = (guchar) 0;
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			write_offset = 0;
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			block_shift = 6;
-#line 11878 "scanner.c"
+#line 12000 "scanner.c"
 			{
-				gint i;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				gint i = 0;
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 11883 "scanner.c"
+#line 12005 "scanner.c"
 				{
-					gboolean _tmp116_;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+					gboolean _tmp116_ = FALSE;
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp116_ = TRUE;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 11890 "scanner.c"
-						gboolean _tmp117_;
-						gint _tmp119_;
-						ScanLine* _tmp120_;
-						gint _tmp121_;
-						gint _tmp122_;
-						ScanLine* _tmp123_;
-						gint _tmp124_;
-						gint offset;
-						gint _tmp150_;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 12012 "scanner.c"
+						gboolean _tmp117_ = FALSE;
+						gint _tmp119_ = 0;
+						ScanLine* _tmp120_ = NULL;
+						gint _tmp121_ = 0;
+						gint offset = 0;
+						gint _tmp122_ = 0;
+						ScanLine* _tmp123_ = NULL;
+						gint _tmp124_ = 0;
+						gint _tmp150_ = 0;
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp117_ = _tmp116_;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp117_) {
-#line 11904 "scanner.c"
-							gint _tmp118_;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 12026 "scanner.c"
+							gint _tmp118_ = 0;
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp118_ = i;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp118_ + 1;
-#line 11910 "scanner.c"
+#line 12032 "scanner.c"
 						}
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp116_ = FALSE;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp119_ = i;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp120_ = line;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp121_ = _tmp120_->n_lines;
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(_tmp119_ < _tmp121_)) {
-#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 11924 "scanner.c"
+#line 12046 "scanner.c"
 						}
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp122_ = i;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp123_ = line;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp124_ = _tmp123_->data_length;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						offset = _tmp122_ * _tmp124_;
-#line 11934 "scanner.c"
+#line 12056 "scanner.c"
 						{
-							gint x;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+							gint x = 0;
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							x = 0;
-#line 11939 "scanner.c"
+#line 12061 "scanner.c"
 							{
-								gboolean _tmp125_;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+								gboolean _tmp125_ = FALSE;
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								_tmp125_ = TRUE;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								while (TRUE) {
-#line 11946 "scanner.c"
-									gboolean _tmp126_;
-									gint _tmp128_;
-									ScanLine* _tmp129_;
-									gint _tmp130_;
-									ScanLine* _tmp131_;
-									guchar* _tmp132_;
-									gint _tmp132__length1;
-									gint _tmp133_;
-									gint _tmp134_;
-									guchar _tmp135_;
-									guchar p;
+#line 12068 "scanner.c"
+									gboolean _tmp126_ = FALSE;
+									gint _tmp128_ = 0;
+									ScanLine* _tmp129_ = NULL;
+									gint _tmp130_ = 0;
+									guchar p = '\0';
+									ScanLine* _tmp131_ = NULL;
+									guchar* _tmp132_ = NULL;
+									gint _tmp132__length1 = 0;
+									gint _tmp133_ = 0;
+									gint _tmp134_ = 0;
+									guchar _tmp135_ = '\0';
 									guchar sample = '\0';
-									guchar _tmp136_;
-									guchar _tmp139_;
-									guchar _tmp140_;
-									gint _tmp141_;
-									gint _tmp142_;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+									guchar _tmp136_ = '\0';
+									guchar _tmp139_ = '\0';
+									guchar _tmp140_ = '\0';
+									gint _tmp141_ = 0;
+									gint _tmp142_ = 0;
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp126_ = _tmp125_;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (!_tmp126_) {
-#line 11968 "scanner.c"
-										gint _tmp127_;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 12090 "scanner.c"
+										gint _tmp127_ = 0;
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp127_ = x;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										x = _tmp127_ + 1;
-#line 11974 "scanner.c"
+#line 12096 "scanner.c"
 									}
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp125_ = FALSE;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp128_ = x;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp129_ = line;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp130_ = _tmp129_->width;
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (!(_tmp128_ < _tmp130_)) {
-#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										break;
-#line 11988 "scanner.c"
+#line 12110 "scanner.c"
 									}
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp131_ = line;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp132_ = _tmp131_->data;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp132__length1 = _tmp131_->data_length1;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp133_ = offset;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp134_ = x;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp135_ = _tmp132_[_tmp133_ + _tmp134_];
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									p = _tmp135_;
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp136_ = p;
-#line 1387 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (((gint) _tmp136_) >= 192) {
-#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										sample = (guchar) 3;
-#line 12010 "scanner.c"
+#line 12132 "scanner.c"
 									} else {
-										guchar _tmp137_;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+										guchar _tmp137_ = '\0';
+#line 1401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp137_ = p;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										if (((gint) _tmp137_) >= 128) {
-#line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											sample = (guchar) 2;
-#line 12019 "scanner.c"
+#line 12141 "scanner.c"
 										} else {
-											guchar _tmp138_;
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+											guchar _tmp138_ = '\0';
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											_tmp138_ = p;
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											if (((gint) _tmp138_) >= 64) {
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 1;
-#line 12028 "scanner.c"
+#line 12150 "scanner.c"
 											} else {
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1406 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 0;
-#line 12032 "scanner.c"
+#line 12154 "scanner.c"
 											}
 										}
 									}
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp139_ = block;
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp140_ = sample;
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp141_ = block_shift;
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									block = _tmp139_ | (_tmp140_ << _tmp141_);
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp142_ = block_shift;
-#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (_tmp142_ == 0) {
-#line 12048 "scanner.c"
-										ScanLine* _tmp143_;
-										guchar* _tmp144_;
-										gint _tmp144__length1;
-										gint _tmp145_;
-										guchar _tmp146_;
-										guchar _tmp147_;
-										gint _tmp148_;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 12170 "scanner.c"
+										ScanLine* _tmp143_ = NULL;
+										guchar* _tmp144_ = NULL;
+										gint _tmp144__length1 = 0;
+										gint _tmp145_ = 0;
+										guchar _tmp146_ = '\0';
+										guchar _tmp147_ = '\0';
+										gint _tmp148_ = 0;
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp143_ = line;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp144_ = _tmp143_->data;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp144__length1 = _tmp143_->data_length1;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp145_ = write_offset;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp146_ = block;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp144_[_tmp145_] = _tmp146_;
-#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp147_ = _tmp144_[_tmp145_];
-#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp148_ = write_offset;
-#line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										write_offset = _tmp148_ + 1;
-#line 1401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block = (guchar) 0;
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = 6;
-#line 12078 "scanner.c"
+#line 12200 "scanner.c"
 									} else {
-										gint _tmp149_;
-#line 1405 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+										gint _tmp149_ = 0;
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp149_ = block_shift;
-#line 1405 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = _tmp149_ - 2;
-#line 12085 "scanner.c"
+#line 12207 "scanner.c"
 									}
 								}
 							}
 						}
-#line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp150_ = block_shift;
-#line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp150_ != 6) {
-#line 12094 "scanner.c"
-							ScanLine* _tmp151_;
-							guchar* _tmp152_;
-							gint _tmp152__length1;
-							gint _tmp153_;
-							guchar _tmp154_;
-							guchar _tmp155_;
-							gint _tmp156_;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 12216 "scanner.c"
+							ScanLine* _tmp151_ = NULL;
+							guchar* _tmp152_ = NULL;
+							gint _tmp152__length1 = 0;
+							gint _tmp153_ = 0;
+							guchar _tmp154_ = '\0';
+							guchar _tmp155_ = '\0';
+							gint _tmp156_ = 0;
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp151_ = line;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp152_ = _tmp151_->data;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp152__length1 = _tmp151_->data_length1;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp153_ = write_offset;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp154_ = block;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp152_[_tmp153_] = _tmp154_;
-#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp155_ = _tmp152_[_tmp153_];
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp156_ = write_offset;
-#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							write_offset = _tmp156_ + 1;
-#line 1413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							block = (guchar) 0;
-#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							block_shift = 6;
-#line 12124 "scanner.c"
+#line 12246 "scanner.c"
 						}
 					}
 				}
 			}
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp157_ = line;
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp158_ = line;
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp159_ = _tmp158_->width;
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp157_->data_length = ((_tmp159_ * 2) + 7) / 8;
-#line 12137 "scanner.c"
+#line 12259 "scanner.c"
 		}
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp160_ = job;
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp161_ = _tmp160_->id;
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp162_ = line;
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp163_ = notify_got_line_new (_tmp161_, _tmp162_);
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp164_ = _tmp163_;
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp164_);
-#line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp164_);
-#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_line_unref0 (line);
-#line 12155 "scanner.c"
+#line 12277 "scanner.c"
 	}
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 12159 "scanner.c"
+#line 12281 "scanner.c"
 }
 
 
 static void _scanner_authorization_cb_sane_authcallback (const gchar* resource, gchar* username, gchar* password) {
-#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_authorization_cb (resource, username, -1, password, -1);
-#line 12166 "scanner.c"
+#line 12288 "scanner.c"
 }
 
 
 static void* scanner_scan_thread (Scanner* self) {
 	void* result = NULL;
 	SANE_Int version_code = {0};
+	SANE_Status status = 0;
 	SANE_Int _tmp0_ = {0};
 	SANE_Status _tmp1_ = 0;
-	SANE_Status status;
-	SANE_Status _tmp2_;
+	SANE_Status _tmp2_ = 0;
 	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_;
-	SANE_Status _tmp5_;
-	SANE_Int _tmp8_;
+	gchar* _tmp4_ = NULL;
+	SANE_Status _tmp5_ = 0;
+	SANE_Int _tmp8_ = {0};
 	gint _tmp9_ = 0;
-	SANE_Int _tmp10_;
+	SANE_Int _tmp10_ = {0};
 	gint _tmp11_ = 0;
-	SANE_Int _tmp12_;
+	SANE_Int _tmp12_ = {0};
 	gint _tmp13_ = 0;
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
-#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = sane_init (&_tmp0_, _scanner_authorization_cb_sane_authcallback);
-#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	version_code = _tmp0_;
-#line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp1_;
-#line 1431 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = status;
-#line 1431 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = sane_status_to_string (_tmp2_);
-#line 1431 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_;
-#line 1431 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1431: sane_init () -> %s", _tmp4_);
-#line 1431 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1443: sane_init () -> %s", _tmp4_);
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp4_);
-#line 1432 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = status;
-#line 1432 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
-#line 12210 "scanner.c"
-		SANE_Status _tmp6_;
+#line 12332 "scanner.c"
+		SANE_Status _tmp6_ = 0;
 		const gchar* _tmp7_ = NULL;
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = status;
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = sane_strstatus (_tmp6_);
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:1434: Unable to initialize SANE backend: %s", _tmp7_);
-#line 1435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_warning ("scanner.vala:1446: Unable to initialize SANE backend: %s", _tmp7_);
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = NULL;
-#line 1435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 12223 "scanner.c"
+#line 12345 "scanner.c"
 	}
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = version_code;
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = SANE_VERSION_MAJOR (_tmp8_);
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = version_code;
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = SANE_VERSION_MINOR (_tmp10_);
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = version_code;
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = SANE_VERSION_BUILD (_tmp12_);
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1437: SANE version %d.%d.%d", _tmp9_, _tmp11_, _tmp13_);
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1449: SANE version %d.%d.%d", _tmp9_, _tmp11_, _tmp13_);
+#line 1455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_redetect (self);
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1457 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
-#line 12243 "scanner.c"
+#line 12365 "scanner.c"
 		gboolean _tmp14_ = FALSE;
-		ScanState _tmp15_;
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		ScanState _tmp15_ = 0;
+#line 1457 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = scanner_handle_requests (self);
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1457 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (!_tmp14_) {
-#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1457 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 12252 "scanner.c"
+#line 12374 "scanner.c"
 		}
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = self->priv->state;
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		switch (_tmp15_) {
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_IDLE:
-#line 12260 "scanner.c"
+#line 12382 "scanner.c"
 			{
-				GList* _tmp16_;
-#line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+				GList* _tmp16_ = NULL;
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_ = self->priv->job_queue;
-#line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp16_ != NULL) {
-#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_set_scanning (self, TRUE);
-#line 1453 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->state = SCAN_STATE_OPEN;
-#line 12271 "scanner.c"
+#line 12393 "scanner.c"
 				}
-#line 1455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12275 "scanner.c"
+#line 12397 "scanner.c"
 			}
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_REDETECT:
-#line 12279 "scanner.c"
+#line 12401 "scanner.c"
 			{
-#line 1457 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_redetect (self);
-#line 1458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1470 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12285 "scanner.c"
+#line 12407 "scanner.c"
 			}
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_OPEN:
-#line 12289 "scanner.c"
+#line 12411 "scanner.c"
 			{
-#line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_open (self);
-#line 1461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12295 "scanner.c"
+#line 12417 "scanner.c"
 			}
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_OPTION:
-#line 12299 "scanner.c"
+#line 12421 "scanner.c"
 			{
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_option (self);
-#line 1464 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12305 "scanner.c"
+#line 12427 "scanner.c"
 			}
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_START:
-#line 12309 "scanner.c"
+#line 12431 "scanner.c"
 			{
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_start (self);
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12315 "scanner.c"
+#line 12437 "scanner.c"
 			}
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_PARAMETERS:
-#line 12319 "scanner.c"
+#line 12441 "scanner.c"
 			{
-#line 1469 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_parameters (self);
-#line 1470 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12325 "scanner.c"
+#line 12447 "scanner.c"
 			}
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_READ:
-#line 12329 "scanner.c"
+#line 12451 "scanner.c"
 			{
-#line 1472 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_read (self);
-#line 1473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12335 "scanner.c"
+#line 12457 "scanner.c"
 			}
 			default:
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 12340 "scanner.c"
+#line 12462 "scanner.c"
 		}
 	}
-#line 1477 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1489 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = NULL;
-#line 1477 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1489 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12347 "scanner.c"
+#line 12469 "scanner.c"
 }
 
 
 static gpointer _scanner_scan_thread_gthread_func (gpointer self) {
 	gpointer result;
 	result = scanner_scan_thread (self);
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_unref (self);
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12358 "scanner.c"
+#line 12480 "scanner.c"
 }
 
 
 void scanner_start (Scanner* self) {
 	GError * _inner_error_ = NULL;
-#line 1480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 12366 "scanner.c"
+#line 12488 "scanner.c"
 	{
-		GThread* _tmp0_;
-		GThread* _tmp1_;
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp0_ = g_thread_try_new ("scan-thread", _scanner_scan_thread_gthread_func, scanner_ref (self), &_inner_error_);
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp1_ = _tmp0_;
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		GThread* _tmp0_ = NULL;
+		GThread* _tmp1_ = NULL;
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp1_ = g_thread_try_new ("scan-thread", _scanner_scan_thread_gthread_func, scanner_ref (self), &_inner_error_);
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp0_ = _tmp1_;
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_inner_error_ != NULL) {
-#line 12376 "scanner.c"
+#line 12498 "scanner.c"
 			goto __catch15_g_error;
 		}
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (self->priv->thread);
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->thread = _tmp1_;
-#line 12383 "scanner.c"
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		self->priv->thread = _tmp0_;
+#line 12505 "scanner.c"
 	}
 	goto __finally15;
 	__catch15_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp2_;
-		const gchar* _tmp3_;
-#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		GError* _tmp2_ = NULL;
+		const gchar* _tmp3_ = NULL;
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		e = _inner_error_;
-#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_inner_error_ = NULL;
-#line 1488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = e;
-#line 1488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = _tmp2_->message;
-#line 1488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_critical ("scanner.vala:1488: Unable to create thread: %s", _tmp3_);
-#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_critical ("scanner.vala:1500: Unable to create thread: %s", _tmp3_);
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_error_free0 (e);
-#line 12403 "scanner.c"
+#line 12525 "scanner.c"
 	}
 	__finally15:
-#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_inner_error_ != NULL) {
-#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1494 "/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 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_clear_error (&_inner_error_);
-#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 12414 "scanner.c"
+#line 12536 "scanner.c"
 	}
 }
 
 
 void scanner_redetect (Scanner* self) {
-	gboolean _tmp0_;
-	GAsyncQueue* _tmp1_;
-	RequestRedetect* _tmp2_;
-#line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gboolean _tmp0_ = FALSE;
+	GAsyncQueue* _tmp1_ = NULL;
+	RequestRedetect* _tmp2_ = NULL;
+#line 1504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1506 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->need_redetect;
-#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1506 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 1495 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 12431 "scanner.c"
+#line 12553 "scanner.c"
 	}
-#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1508 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->need_redetect = TRUE;
-#line 1498 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1498: Requesting redetection of scan devices");
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1510: Requesting redetection of scan devices");
+#line 1512 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->request_queue;
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1512 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = request_redetect_new ();
-#line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1512 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
-#line 12443 "scanner.c"
+#line 12565 "scanner.c"
 }
 
 
 gboolean scanner_is_scanning (Scanner* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_;
-#line 1503 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gboolean _tmp0_ = FALSE;
+#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1505 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->scanning;
-#line 1505 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp0_;
-#line 1505 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12458 "scanner.c"
+#line 12580 "scanner.c"
 }
 
 
 static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 	gchar* result = NULL;
-	ScanMode _tmp0_;
-#line 1508 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	ScanMode _tmp0_ = 0;
+#line 1520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = mode;
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp0_) {
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_DEFAULT:
-#line 12473 "scanner.c"
+#line 12595 "scanner.c"
 		{
-			gchar* _tmp1_;
-#line 1513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp1_ = NULL;
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp1_ = g_strdup ("ScanMode.DEFAULT");
-#line 1513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp1_;
-#line 1513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12482 "scanner.c"
+#line 12604 "scanner.c"
 		}
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_COLOR:
-#line 12486 "scanner.c"
+#line 12608 "scanner.c"
 		{
-			gchar* _tmp2_;
-#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp2_ = NULL;
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp2_ = g_strdup ("ScanMode.COLOR");
-#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp2_;
-#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12495 "scanner.c"
+#line 12617 "scanner.c"
 		}
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_GRAY:
-#line 12499 "scanner.c"
+#line 12621 "scanner.c"
 		{
-			gchar* _tmp3_;
-#line 1517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp3_ = NULL;
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = g_strdup ("ScanMode.GRAY");
-#line 1517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp3_;
-#line 1517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12508 "scanner.c"
+#line 12630 "scanner.c"
 		}
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_LINEART:
-#line 12512 "scanner.c"
+#line 12634 "scanner.c"
 		{
-			gchar* _tmp4_;
-#line 1519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp4_ = NULL;
+#line 1531 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = g_strdup ("ScanMode.LINEART");
-#line 1519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1531 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp4_;
-#line 1519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1531 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12521 "scanner.c"
+#line 12643 "scanner.c"
 		}
 		default:
 		{
-			ScanMode _tmp5_;
+			ScanMode _tmp5_ = 0;
 			gchar* _tmp6_ = NULL;
-#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = mode;
-#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = g_strdup_printf ("%d", (gint) _tmp5_);
-#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp6_;
-#line 1521 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12535 "scanner.c"
+#line 12657 "scanner.c"
 		}
 	}
 }
@@ -12547,78 +12670,78 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 
 static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 	gchar* result = NULL;
-	ScanType _tmp0_;
-#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	ScanType _tmp0_ = 0;
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = type;
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp0_) {
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_SINGLE:
-#line 12552 "scanner.c"
+#line 12674 "scanner.c"
 		{
-			gchar* _tmp1_;
-#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp1_ = NULL;
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp1_ = g_strdup ("ScanType.SINGLE");
-#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp1_;
-#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12561 "scanner.c"
+#line 12683 "scanner.c"
 		}
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_FRONT:
-#line 12565 "scanner.c"
+#line 12687 "scanner.c"
 		{
-			gchar* _tmp2_;
-#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp2_ = NULL;
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp2_ = g_strdup ("ScanType.ADF_FRONT");
-#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp2_;
-#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12574 "scanner.c"
+#line 12696 "scanner.c"
 		}
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BACK:
-#line 12578 "scanner.c"
+#line 12700 "scanner.c"
 		{
-			gchar* _tmp3_;
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp3_ = NULL;
+#line 1546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = g_strdup ("ScanType.ADF_BACK");
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp3_;
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12587 "scanner.c"
+#line 12709 "scanner.c"
 		}
-#line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BOTH:
-#line 12591 "scanner.c"
+#line 12713 "scanner.c"
 		{
-			gchar* _tmp4_;
-#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+			gchar* _tmp4_ = NULL;
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = g_strdup ("ScanType.ADF_BOTH");
-#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp4_;
-#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12600 "scanner.c"
+#line 12722 "scanner.c"
 		}
 		default:
 		{
-			ScanType _tmp5_;
+			ScanType _tmp5_ = 0;
 			gchar* _tmp6_ = NULL;
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = type;
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = g_strdup_printf ("%d", (gint) _tmp5_);
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp6_;
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12614 "scanner.c"
+#line 12736 "scanner.c"
 		}
 	}
 }
@@ -12626,291 +12749,291 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 
 void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options) {
 	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_;
-	const gchar* _tmp3_;
-	ScanOptions* _tmp4_;
-	gint _tmp5_;
-	ScanOptions* _tmp6_;
-	ScanMode _tmp7_;
+	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	ScanOptions* _tmp4_ = NULL;
+	gint _tmp5_ = 0;
+	ScanOptions* _tmp6_ = NULL;
+	ScanMode _tmp7_ = 0;
 	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_;
-	ScanOptions* _tmp10_;
-	gint _tmp11_;
-	ScanOptions* _tmp12_;
-	ScanType _tmp13_;
+	gchar* _tmp9_ = NULL;
+	ScanOptions* _tmp10_ = NULL;
+	gint _tmp11_ = 0;
+	ScanOptions* _tmp12_ = NULL;
+	ScanType _tmp13_ = 0;
 	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_;
-	ScanOptions* _tmp16_;
-	gint _tmp17_;
-	ScanOptions* _tmp18_;
-	gint _tmp19_;
-	ScanOptions* _tmp20_;
-	gint _tmp21_;
-	ScanOptions* _tmp22_;
-	gint _tmp23_;
-	RequestStartScan* _tmp24_;
-	RequestStartScan* request;
-	ScanJob* _tmp25_;
-	ScanJob* _tmp26_;
-	gint _tmp27_;
-	ScanJob* _tmp28_;
-	const gchar* _tmp29_;
-	gchar* _tmp30_;
-	ScanJob* _tmp31_;
-	ScanOptions* _tmp32_;
-	gint _tmp33_;
-	ScanJob* _tmp34_;
-	ScanOptions* _tmp35_;
-	ScanMode _tmp36_;
-	ScanJob* _tmp37_;
-	ScanOptions* _tmp38_;
-	gint _tmp39_;
-	ScanJob* _tmp40_;
-	ScanOptions* _tmp41_;
-	ScanType _tmp42_;
-	ScanJob* _tmp43_;
-	ScanOptions* _tmp44_;
-	gint _tmp45_;
-	ScanJob* _tmp46_;
-	ScanOptions* _tmp47_;
-	gint _tmp48_;
-	ScanJob* _tmp49_;
-	ScanOptions* _tmp50_;
-	gint _tmp51_;
-	ScanJob* _tmp52_;
-	ScanOptions* _tmp53_;
-	gint _tmp54_;
-	GAsyncQueue* _tmp55_;
-	Request* _tmp56_;
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gchar* _tmp15_ = NULL;
+	ScanOptions* _tmp16_ = NULL;
+	gint _tmp17_ = 0;
+	ScanOptions* _tmp18_ = NULL;
+	gint _tmp19_ = 0;
+	ScanOptions* _tmp20_ = NULL;
+	gint _tmp21_ = 0;
+	ScanOptions* _tmp22_ = NULL;
+	gint _tmp23_ = 0;
+	RequestStartScan* request = NULL;
+	RequestStartScan* _tmp24_ = NULL;
+	ScanJob* _tmp25_ = NULL;
+	ScanJob* _tmp26_ = NULL;
+	gint _tmp27_ = 0;
+	ScanJob* _tmp28_ = NULL;
+	const gchar* _tmp29_ = NULL;
+	gchar* _tmp30_ = NULL;
+	ScanJob* _tmp31_ = NULL;
+	ScanOptions* _tmp32_ = NULL;
+	gint _tmp33_ = 0;
+	ScanJob* _tmp34_ = NULL;
+	ScanOptions* _tmp35_ = NULL;
+	ScanMode _tmp36_ = 0;
+	ScanJob* _tmp37_ = NULL;
+	ScanOptions* _tmp38_ = NULL;
+	gint _tmp39_ = 0;
+	ScanJob* _tmp40_ = NULL;
+	ScanOptions* _tmp41_ = NULL;
+	ScanType _tmp42_ = 0;
+	ScanJob* _tmp43_ = NULL;
+	ScanOptions* _tmp44_ = NULL;
+	gint _tmp45_ = 0;
+	ScanJob* _tmp46_ = NULL;
+	ScanOptions* _tmp47_ = NULL;
+	gint _tmp48_ = 0;
+	ScanJob* _tmp49_ = NULL;
+	ScanOptions* _tmp50_ = NULL;
+	gint _tmp51_ = 0;
+	ScanJob* _tmp52_ = NULL;
+	ScanOptions* _tmp53_ = NULL;
+	gint _tmp54_ = 0;
+	GAsyncQueue* _tmp55_ = NULL;
+	Request* _tmp56_ = NULL;
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (options != NULL);
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = device;
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ != NULL) {
-#line 12686 "scanner.c"
-		const gchar* _tmp2_;
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 12808 "scanner.c"
+		const gchar* _tmp2_ = NULL;
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = device;
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
-#line 12692 "scanner.c"
+#line 12814 "scanner.c"
 	} else {
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = "(null)";
-#line 12696 "scanner.c"
+#line 12818 "scanner.c"
 	}
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp0_;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = options;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_->dpi;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = options;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = _tmp6_->scan_mode;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = scanner_get_scan_mode_string (self, _tmp7_);
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = _tmp8_;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = options;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = _tmp10_->depth;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = options;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = _tmp12_->type;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = scanner_get_scan_type_string (self, _tmp13_);
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = _tmp14_;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = options;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = _tmp16_->paper_width;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = options;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = _tmp18_->paper_height;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = options;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = _tmp20_->brightness;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = options;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = _tmp22_->contrast;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1544: Scanner.scan (\"%s\", dpi=%d, scan_mode=%s, depth=%" \
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1556: Scanner.scan (\"%s\", dpi=%d, scan_mode=%s, depth=%" \
 "d, type=%s, paper_width=%d, paper_height=%d, brightness=%d, contrast=%" \
 "d)", _tmp3_, _tmp5_, _tmp9_, _tmp11_, _tmp15_, _tmp17_, _tmp19_, _tmp21_, _tmp23_);
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp15_);
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp9_);
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = request_start_scan_new ();
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request = _tmp24_;
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = scan_job_new ();
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (request->job);
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request->job = _tmp25_;
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = request->job;
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = self->job_id;
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->job_id = _tmp27_ + 1;
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_->id = _tmp27_;
-#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = request->job;
-#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = device;
-#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = g_strdup (_tmp29_);
-#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp28_->device);
-#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_->device = _tmp30_;
-#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = request->job;
-#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp32_ = options;
-#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_ = _tmp32_->dpi;
-#line 1552 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_->dpi = (gdouble) _tmp33_;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = request->job;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = options;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = _tmp35_->scan_mode;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_->scan_mode = _tmp36_;
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_ = request->job;
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = options;
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = _tmp38_->depth;
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_->depth = _tmp39_;
-#line 1555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_ = request->job;
-#line 1555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = options;
-#line 1555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = _tmp41_->type;
-#line 1555 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_->type = _tmp42_;
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = request->job;
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = options;
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp45_ = _tmp44_->paper_width;
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_->page_width = _tmp45_;
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp46_ = request->job;
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp47_ = options;
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp48_ = _tmp47_->paper_height;
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp46_->page_height = _tmp48_;
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp49_ = request->job;
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp50_ = options;
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp51_ = _tmp50_->brightness;
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp49_->brightness = _tmp51_;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp52_ = request->job;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp53_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp54_ = _tmp53_->contrast;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp52_->contrast = _tmp54_;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp55_ = self->priv->request_queue;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp56_ = _request_ref0 ((Request*) request);
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp55_, _tmp56_);
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_request_unref0 (request);
-#line 12846 "scanner.c"
+#line 12968 "scanner.c"
 }
 
 
 void scanner_cancel (Scanner* self) {
-	gint _tmp0_;
-	GAsyncQueue* _tmp1_;
-	RequestCancel* _tmp2_;
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	gint _tmp0_ = 0;
+	GAsyncQueue* _tmp1_ = NULL;
+	RequestCancel* _tmp2_ = NULL;
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->job_id;
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->first_job_id = _tmp0_;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->request_queue;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = request_cancel_new ();
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
-#line 12866 "scanner.c"
+#line 12988 "scanner.c"
 }
 
 
 void scanner_free (Scanner* self) {
-	GAsyncQueue* _tmp0_;
-	RequestQuit* _tmp1_;
-	GThread* _tmp2_;
-#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	GAsyncQueue* _tmp0_ = NULL;
+	RequestQuit* _tmp1_ = NULL;
+	GThread* _tmp2_ = NULL;
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1571: Stopping scan thread");
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1583: Stopping scan thread");
+#line 1585 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->request_queue;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1585 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = request_quit_new ();
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1585 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp0_, (Request*) _tmp1_);
-#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->thread;
-#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_ != NULL) {
-#line 12888 "scanner.c"
-		GThread* _tmp3_;
-#line 1577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 13010 "scanner.c"
+		GThread* _tmp3_ = NULL;
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = self->priv->thread;
-#line 1577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_thread_join (_tmp3_);
-#line 1578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (self->priv->thread);
-#line 1578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->thread = NULL;
-#line 12898 "scanner.c"
+#line 13020 "scanner.c"
 	}
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	sane_exit ();
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:1582: sane_exit ()");
-#line 12904 "scanner.c"
+#line 1594 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	g_debug ("scanner.vala:1594: sane_exit ()");
+#line 13026 "scanner.c"
 }
 
 
@@ -12929,19 +13052,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 12923 "scanner.c"
+#line 13045 "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 12929 "scanner.c"
+#line 13051 "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 12935 "scanner.c"
+#line 13057 "scanner.c"
 }
 
 
@@ -12960,19 +13083,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 12954 "scanner.c"
+#line 13076 "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 12960 "scanner.c"
+#line 13082 "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 12966 "scanner.c"
+#line 13088 "scanner.c"
 }
 
 
@@ -12991,26 +13114,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 12985 "scanner.c"
+#line 13107 "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 12991 "scanner.c"
+#line 13113 "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 12997 "scanner.c"
+#line 13119 "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 13004 "scanner.c"
+#line 13126 "scanner.c"
 }
 
 
@@ -13019,7 +13142,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 13013 "scanner.c"
+#line 13135 "scanner.c"
 	}
 }
 
@@ -13029,11 +13152,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 13023 "scanner.c"
+#line 13145 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 13027 "scanner.c"
+#line 13149 "scanner.c"
 	}
 }
 
@@ -13041,37 +13164,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 13035 "scanner.c"
+#line 13157 "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 13042 "scanner.c"
+#line 13164 "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 13049 "scanner.c"
+#line 13171 "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 13053 "scanner.c"
+#line 13175 "scanner.c"
 		}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scanner_ref (object);
-#line 13057 "scanner.c"
+#line 13179 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13061 "scanner.c"
+#line 13183 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 13065 "scanner.c"
+#line 13187 "scanner.c"
 }
 
 
@@ -13082,25 +13205,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 13076 "scanner.c"
+#line 13198 "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 13082 "scanner.c"
+#line 13204 "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 13086 "scanner.c"
+#line 13208 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scanner_ref (value->data[0].v_pointer);
-#line 13090 "scanner.c"
+#line 13212 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 13094 "scanner.c"
+#line 13216 "scanner.c"
 }
 
 
@@ -13114,7 +13237,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 13108 "scanner.c"
+#line 13230 "scanner.c"
 }
 
 
@@ -13123,7 +13246,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 13117 "scanner.c"
+#line 13239 "scanner.c"
 }
 
 
@@ -13143,17 +13266,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 13137 "scanner.c"
+#line 13259 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13141 "scanner.c"
+#line 13263 "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 13147 "scanner.c"
+#line 13269 "scanner.c"
 	}
 }
 
@@ -13172,17 +13295,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 13166 "scanner.c"
+#line 13288 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13170 "scanner.c"
+#line 13292 "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 13176 "scanner.c"
+#line 13298 "scanner.c"
 	}
 }
 
@@ -13212,7 +13335,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 13206 "scanner.c"
+#line 13328 "scanner.c"
 }
 
 
@@ -13221,7 +13344,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 13215 "scanner.c"
+#line 13337 "scanner.c"
 }
 
 
@@ -13247,7 +13370,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 13241 "scanner.c"
+#line 13363 "scanner.c"
 }
 
 
@@ -13272,7 +13395,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 13266 "scanner.c"
+#line 13388 "scanner.c"
 }
 
 
@@ -13285,7 +13408,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 13279 "scanner.c"
+#line 13401 "scanner.c"
 	}
 }
 
-- 
cgit v1.2.3