Imported Upstream version 3.17.1upstream/3.17.1

82 files changed, 16647 insertions, 15705 deletions

diff --git a/Makefile.in b/Makefile.in
index 3d6abbf..939381b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,7 +78,7 @@ POST_UNINSTALL = :
 subdir = .
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) COPYING NEWS \
-	compile depcomp install-sh missing
+	compile install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
diff --git a/NEWS b/NEWS
index 131cb34..852b560 100644
--- a/NEWS
+++ b/NEWS
@@ -1,14 +1,8 @@
-Overview of changes in simple-scan 3.16.1.1
+Overview of changes in simple-scan 3.17.1
 
   * Fix logic for adding blank page on page removal.
-
-Overview of changes in simple-scan 3.16.1
-
   * Fix save button being inactive on pages restored after a crash
-
-Overview of changes in simple-scan 3.16.0.1
-
-  * Rebuild package from scratch to fix invalid po/Makefile.in.in
+  * Make appdata translatable and add screenshot
 
 Overview of changes in simple-scan 3.16.0
 
diff --git a/configure b/configure
index 7d930bf..549c17c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for simple-scan 3.16.1.1.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.17.1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -637,8 +637,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='simple-scan'
 PACKAGE_TARNAME='simple-scan'
-PACKAGE_VERSION='3.16.1.1'
-PACKAGE_STRING='simple-scan 3.16.1.1'
+PACKAGE_VERSION='3.17.1'
+PACKAGE_STRING='simple-scan 3.17.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1397,7 +1397,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures simple-scan 3.16.1.1 to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.17.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1463,7 +1463,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of simple-scan 3.16.1.1:";;
+     short | recursive ) echo "Configuration of simple-scan 3.17.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1579,7 +1579,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-simple-scan configure 3.16.1.1
+simple-scan configure 3.17.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1831,7 +1831,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by simple-scan $as_me 3.16.1.1, which was
+It was created by simple-scan $as_me 3.17.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2694,7 +2694,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='simple-scan'
- VERSION='3.16.1.1'
+ VERSION='3.17.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6370,7 +6370,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by simple-scan $as_me 3.16.1.1, which was
+This file was extended by simple-scan $as_me 3.17.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6427,7 +6427,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-simple-scan config.status 3.16.1.1
+simple-scan config.status 3.17.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index e2b273c..27b7ecb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(simple-scan, 3.16.1.1)
+AC_INIT(simple-scan, 3.17.1)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
diff --git a/data/Makefile.am b/data/Makefile.am
index b436f12..6d68e8e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,15 +5,16 @@ desktop_DATA = simple-scan.desktop
 @INTLTOOL_DESKTOP_RULE@
 
 appdatadir = $(datadir)/appdata
-dist_appdata_DATA = simple-scan.appdata.xml
+appdata_DATA = simple-scan.appdata.xml
+@INTLTOOL_XML_RULE@
 
 gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
-@INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 dist_man1_MANS = simple-scan.1
 
 EXTRA_DIST = simple-scan.desktop.in \
+             simple-scan.appdata.xml.in \
              org.gnome.SimpleScan.gschema.xml.in \
              simple-scan.ui \
              simple-scan.gresource.xml
@@ -22,4 +23,5 @@ DISTCLEANFILES = \
 	Makefile.in \
 	$(schema_DATA) \
 	$(desktop_DATA) \
+	$(appdata_DATA) \
 	$(gsettings_SCHEMAS)
diff --git a/data/Makefile.in b/data/Makefile.in
index 8ec41db..6031c4e 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -78,7 +78,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = data
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(dist_man1_MANS) $(dist_appdata_DATA)
+	$(dist_man1_MANS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -141,11 +141,11 @@ am__uninstall_files_from_dir = { \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" \
-	"$(DESTDIR)$(appdatadir)"
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdatadir)" \
+	"$(DESTDIR)$(desktopdir)"
 NROFF = nroff
 MANS = $(dist_man1_MANS)
-DATA = $(desktop_DATA) $(dist_appdata_DATA)
+DATA = $(appdata_DATA) $(desktop_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
@@ -328,10 +328,11 @@ SUBDIRS = icons
 desktopdir = $(datadir)/applications
 desktop_DATA = simple-scan.desktop
 appdatadir = $(datadir)/appdata
-dist_appdata_DATA = simple-scan.appdata.xml
+appdata_DATA = simple-scan.appdata.xml
 gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
 dist_man1_MANS = simple-scan.1
 EXTRA_DIST = simple-scan.desktop.in \
+             simple-scan.appdata.xml.in \
              org.gnome.SimpleScan.gschema.xml.in \
              simple-scan.ui \
              simple-scan.gresource.xml
@@ -340,6 +341,7 @@ DISTCLEANFILES = \
 	Makefile.in \
 	$(schema_DATA) \
 	$(desktop_DATA) \
+	$(appdata_DATA) \
 	$(gsettings_SCHEMAS)
 
 all: all-recursive
@@ -416,48 +418,48 @@ uninstall-man1:
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-desktopDATA: $(desktop_DATA)
+install-appdataDATA: $(appdata_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	@list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \
 	done
 
-uninstall-desktopDATA:
+uninstall-appdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	@list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
-install-dist_appdataDATA: $(dist_appdata_DATA)
+	dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
+install-desktopDATA: $(desktop_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(dist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \
+	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
 	done
 
-uninstall-dist_appdataDATA:
+uninstall-desktopDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_appdata_DATA)'; test -n "$(appdatadir)" || list=; \
+	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
+	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
@@ -618,7 +620,7 @@ check: check-recursive
 all-am: Makefile $(MANS) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(appdatadir)"; do \
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(desktopdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -672,8 +674,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-desktopDATA install-dist_appdataDATA \
-	install-man
+install-data-am: install-appdataDATA install-desktopDATA install-man
 
 install-dvi: install-dvi-recursive
 
@@ -717,7 +718,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-desktopDATA uninstall-dist_appdataDATA \
+uninstall-am: uninstall-appdataDATA uninstall-desktopDATA \
 	uninstall-man
 
 uninstall-man: uninstall-man1
@@ -727,20 +728,20 @@ uninstall-man: uninstall-man1
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
 	check-am clean clean-generic cscopelist-am ctags ctags-am \
 	distclean distclean-generic distclean-tags distdir dvi dvi-am \
-	html html-am info info-am install install-am install-data \
-	install-data-am install-desktopDATA install-dist_appdataDATA \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-man1 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-am uninstall uninstall-am \
-	uninstall-desktopDATA uninstall-dist_appdataDATA uninstall-man \
-	uninstall-man1
+	html html-am info info-am install install-am \
+	install-appdataDATA install-data install-data-am \
+	install-desktopDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-man1 install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-appdataDATA uninstall-desktopDATA \
+	uninstall-man uninstall-man1
 
 @INTLTOOL_DESKTOP_RULE@
-@INTLTOOL_XML_NOMERGE_RULE@
+@INTLTOOL_XML_RULE@
 @GSETTINGS_RULES@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/data/simple-scan.appdata.xml b/data/simple-scan.appdata.xml.in
index dd57ff6..3a3d0ef 100644
--- a/data/simple-scan.appdata.xml
+++ b/data/simple-scan.appdata.xml.in
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application>
   <id type="desktop">simple-scan.desktop</id>
-  <licence>CC0</licence>
+  <metadata_licence>CC0-1.0</metadata_licence>
+  <project_license>GPL-3.0+ and CC-BY-SA-3.0</project_license>
+  <_name>Simple Scan</_name>
   <description>
-    <p>
+    <_p>
       A really easy way to scan both documents and photos.
       You can crop out the bad parts of a photo and rotate it if it is the wrong way round.
       You can print your scans, export them to pdf, or save them in a range of image formats.
-    </p>
-    <p>
+    </_p>
+    <_p>
       Simple Scan uses the SANE framework to support most existing scanners.
-    </p>
+    </_p>
   </description>
+  <screenshots>
+    <screenshot type="default">https://launchpadlibrarian.net/203209644/simple-scan.png</screenshot>
+  </screenshots>
   <url type="homepage">https://launchpad.net/simple-scan</url>
 </application>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 93a99e0..4dd5502 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,6 +3,7 @@
 [encoding: UTF-8]
 [type: gettext/glade]data/simple-scan.ui
 data/simple-scan.desktop.in
+data/simple-scan.appdata.xml.in
 data/org.gnome.SimpleScan.gschema.xml.in
 src/book.vala
 src/book-view.vala
diff --git a/po/af.po b/po/af.po
index 4608554..d56547d 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-09-03 08:13+0000\n"
 "Last-Translator: Dawid de Jager <dawid.dejager@gmail.com>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Terug"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Eenvoudige Skandeer"
 
@@ -303,6 +304,19 @@ msgstr "Skandeer dokumente"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Skanderingstoestel"
diff --git a/po/am.po b/po/am.po
index a579334..cb8661c 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2015-03-15 04:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Amharic <am@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-16 05:44+0000\n"
-"X-Generator: Launchpad (build 17389)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "ጀርባ"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "ቀላል ማሰሻ"
 
@@ -303,6 +304,19 @@ msgstr "ሰነድ ማሰሻ"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 10c4807..21dd679 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 08:56+0000\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "الخلف"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "الماسحة الضوئية"
 
@@ -303,6 +304,19 @@ msgstr "امسح المستندات"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "الجهاز الذي سيمسح منه"
diff --git a/po/ast.po b/po/ast.po
index b362e5c..3a8c458 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 08:57+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Asturian <ast@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr ""
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
@@ -89,7 +90,7 @@ msgstr "Semeya"
 #. Title of dialog to reorder pages
 #: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Reordenar les páxines"
 
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:30
@@ -293,7 +294,7 @@ msgstr "Calidá:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "Escáner de documentos"
 
 #: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
@@ -301,6 +302,19 @@ msgstr ""
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
+msgstr "escanear;escáner;planu;adf;"
+
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
@@ -557,22 +571,22 @@ msgstr ""
 #. Label on button for combining sides in reordering dialog
 #: ../src/ui.vala:1203
 msgid "Combine sides"
-msgstr ""
+msgstr "Combinar llaos"
 
 #. Label on button for combining sides in reverse order in reordering dialog
 #: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Combinar llaos (inversu)"
 
 #. Label on button for reversing in reordering dialog
 #: ../src/ui.vala:1223
 msgid "Reverse"
-msgstr ""
+msgstr "Inversu"
 
 #. Label on button for cancelling page reordering dialog
 #: ../src/ui.vala:1233
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Caltener ensin cambeos"
 
 #. Error message displayed when unable to launch help browser
 #: ../src/ui.vala:1448
@@ -663,31 +677,31 @@ msgstr ""
 
 #: ../src/ui.vala:1683
 msgid "New Document"
-msgstr ""
+msgstr "Documentu nuevu"
 
 #: ../src/ui.vala:1688
 msgid "Document"
-msgstr ""
+msgstr "Documentu"
 
 #: ../src/ui.vala:1692
 msgid "Email..."
-msgstr ""
+msgstr "Corréu-e..."
 
 #: ../src/ui.vala:1693
 msgid "Print..."
-msgstr ""
+msgstr "Imprentar..."
 
 #: ../src/ui.vala:1701
 msgid "Help"
-msgstr ""
+msgstr "Ayuda"
 
 #: ../src/ui.vala:1702
 msgid "About"
-msgstr ""
+msgstr "Tocante a"
 
 #: ../src/ui.vala:1703
 msgid "Quit"
-msgstr ""
+msgstr "Quitar"
 
 #. Button in error infobar to open preferences dialog and change scanner
 #: ../src/ui.vala:1737
diff --git a/po/az.po b/po/az.po
index 9b3314f..c18236f 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2015-01-01 15:02+0000\n"
 "Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"
 "Language-Team: Azerbaijani <az@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Arxa"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
@@ -303,6 +304,19 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 9839494..3beab8e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-12-01 09:04+0000\n"
 "Last-Translator: Svetoslav Stefanov <svetlisashkov@yahoo.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Обратна страна"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Опростено сканиране"
 
@@ -303,6 +304,19 @@ msgstr "Сканиране на документи"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Устройство за сканиране"
diff --git a/po/bo.po b/po/bo.po
index 0d4c4be..aaf459a 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Tibetan <bo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "རྒྱབ་ཕྱོགས"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "པར་བཤུ་དཀྱུས་མ"
 
@@ -303,6 +304,19 @@ msgstr "ཡིག་གེ་པར་བཤུ"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "འབྱུང་ཁུངས་མི་འདྲ་བའི་པར་བཤུ་སྒྲིག་ཆས"
diff --git a/po/ca.po b/po/ca.po
index b5feb56..07d3aee 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 08:57+0000\n"
 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Revers de la pàgina"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Escaneig senzill"
 
@@ -303,6 +304,19 @@ msgstr "Escanegeu documents"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispositiu d'escaneig"
@@ -682,19 +696,19 @@ msgstr "Document nou"
 
 #: ../src/ui.vala:1688
 msgid "Document"
-msgstr ""
+msgstr "Document"
 
 #: ../src/ui.vala:1692
 msgid "Email..."
-msgstr ""
+msgstr "Envia per correu electrònic..."
 
 #: ../src/ui.vala:1693
 msgid "Print..."
-msgstr ""
+msgstr "Imprimeix..."
 
 #: ../src/ui.vala:1701
 msgid "Help"
-msgstr ""
+msgstr "Ajuda"
 
 #: ../src/ui.vala:1702
 msgid "About"
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index f093a08..9269b4f 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Catalan (Valencian) <ca@valencia@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Revers de la pàgina"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Escaneig senzill"
 
@@ -303,6 +304,19 @@ msgstr "Escanegeu documents"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispositiu d'escaneig"
diff --git a/po/ce.po b/po/ce.po
index 6191d7c..5ac04fb 100644
--- a/po/ce.po
+++ b/po/ce.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2014-08-12 08:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chechen <ce@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr ""
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
@@ -303,6 +304,19 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 3171e97..2e65421 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2013-12-18 12:25+0000\n"
 "Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Zadní"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Jednoduché skenování"
 
@@ -303,6 +304,19 @@ msgstr "Naskenovat dokumenty"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Zařízení určené ke skenování"
diff --git a/po/da.po b/po/da.po
index 4708499..bce7ffb 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-10-10 12:13+0000\n"
 "Last-Translator: AJenbo <anders@jenbo.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Bagside"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Simpel skanning"
 
@@ -303,6 +304,19 @@ msgstr "Skan dokumenter"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Enhed at skanne fra"
diff --git a/po/de.po b/po/de.po
index 49ba613..b9f49b9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2015-01-16 18:30+0000\n"
 "Last-Translator: Tobias Bannert <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Rückseite"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
@@ -303,6 +304,19 @@ msgstr "Dokumente scannen"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;einlesen;scanner;Flachbrett;flatbed;AVW;Vorlagenwechsler;adf;"
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Scangerät"
@@ -664,6 +678,7 @@ msgstr ""
 "  Moritz Baumann https://launchpad.net/~mo42\n"
 "  Phillip Sz https://launchpad.net/~phillip-sz\n"
 "  Raphael J. Schmid https://launchpad.net/~raphael-j-schmid\n"
+"  Scherbruch https://launchpad.net/~scherbruch\n"
 "  Stefan Buchholz https://launchpad.net/~stef-buchholz\n"
 "  Steve G. https://launchpad.net/~sgo.ger\n"
 "  Thomas Heidrich https://launchpad.net/~gnuheidix\n"
diff --git a/po/el.po b/po/el.po
index 8df5708..a697c3a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2013-07-03 07:45+0000\n"
 "Last-Translator: John Pag <ioanpagges@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Πίσω όψη"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Σάρωση"
 
@@ -89,7 +90,7 @@ msgstr "Φωτογραφία"
 #. Title of dialog to reorder pages
 #: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Επαναδιάταξη σελίδων"
 
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:30
@@ -293,7 +294,7 @@ msgstr "Ποιότητα:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "Σαρωτής εγγράφων"
 
 #: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
@@ -303,6 +304,19 @@ msgstr "Σάρωση εγγράφων"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Συσκευή που χρησιμοποιείται για σάρωση"
@@ -585,7 +599,7 @@ msgstr ""
 #. Label on button for cancelling page reordering dialog
 #: ../src/ui.vala:1233
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Διατήρηση αμετάβλητων"
 
 #. Error message displayed when unable to launch help browser
 #: ../src/ui.vala:1448
@@ -638,6 +652,7 @@ msgstr "Απλό εργαλείο σάρωσης εγγράφων"
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Aggelos Arnaoutis https://launchpad.net/~angelosarn\n"
 "  Alex Ferguson https://launchpad.net/~thoughtmonster\n"
 "  Christos Spyroglou https://launchpad.net/~cspyroglou\n"
 "  Filippos Kolyvas https://launchpad.net/~fkol-k4\n"
@@ -688,31 +703,31 @@ msgstr "%d dpi"
 
 #: ../src/ui.vala:1683
 msgid "New Document"
-msgstr ""
+msgstr "Νέο έγγραφο"
 
 #: ../src/ui.vala:1688
 msgid "Document"
-msgstr ""
+msgstr "Έγγραφο"
 
 #: ../src/ui.vala:1692
 msgid "Email..."
-msgstr ""
+msgstr "Ηλεκτρονική αλληλογραφία..."
 
 #: ../src/ui.vala:1693
 msgid "Print..."
-msgstr ""
+msgstr "Εκτύπωση..."
 
 #: ../src/ui.vala:1701
 msgid "Help"
-msgstr ""
+msgstr "Βοήθεια"
 
 #: ../src/ui.vala:1702
 msgid "About"
-msgstr ""
+msgstr "Περί"
 
 #: ../src/ui.vala:1703
 msgid "Quit"
-msgstr ""
+msgstr "'Εξοδος"
 
 #. Button in error infobar to open preferences dialog and change scanner
 #: ../src/ui.vala:1737
diff --git a/po/en_GB.po b/po/en_GB.po
index fc3e18e..c30f19c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 08:58+0000\n"
 "Last-Translator: James Thorrold <jameslin@inbox.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Back"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
@@ -303,6 +304,19 @@ msgstr "Scan Documents"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbed;adf;"
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Device to scan from"
diff --git a/po/eo.po b/po/eo.po
index 7800f12..542b5e5 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-08-16 11:04+0000\n"
 "Last-Translator: Michael Moroni <michael.moroni@openmailbox.org>\n"
 "Language-Team: Esperanto\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 "Language: eo\n"
 
 #. Button to submit authorization dialog
@@ -50,6 +50,7 @@ msgstr "Dorso"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Simpla skano"
 
@@ -304,6 +305,19 @@ msgstr "Skani dokumentojn"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "La aparato el kiu skani"
diff --git a/po/es.po b/po/es.po
index 79c755b..5ec52ef 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2014-07-22 10:50+0000\n"
 "Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Reverso"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
@@ -303,6 +304,19 @@ msgstr "Escanear documentos"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "escanear;escáner;plano;adf;"
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Para escanear desde el dispositivo"
diff --git a/po/et.po b/po/et.po
index d4dbe14..7a3e03d 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 08:59+0000\n"
 "Last-Translator: mahfiaz <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Tagakülg"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Lihtne skannija"
 
@@ -303,6 +304,19 @@ msgstr "Dokumentide skannimine"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Seade, millest skannida"
diff --git a/po/eu.po b/po/eu.po
index 9b9cdec..f61dbec 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2014-03-11 21:02+0000\n"
 "Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
 "Language-Team: Basque <eu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Atzealdea"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
@@ -303,6 +304,19 @@ msgstr "Eskaneatu dokumentuak"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Eskaneatze-gailua"
diff --git a/po/fi.po b/po/fi.po
index f8f1e69..c09265b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2013-09-22 12:07+0000\n"
 "Last-Translator: Jiri Grönroos <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Takapuoli"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Kuvanluku"
 
@@ -303,6 +304,19 @@ msgstr "Lue asiakirjoja kuvanlukijalta"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Laite jolta luetaan"
diff --git a/po/fr.po b/po/fr.po
index 7316a76..c321e27 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
-"PO-Revision-Date: 2015-03-13 01:21+0000\n"
-"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"PO-Revision-Date: 2015-04-21 20:04+0000\n"
+"Last-Translator: Jean Marc <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-14 05:13+0000\n"
-"X-Generator: Launchpad (build 17389)\n"
+"X-Launchpad-Export-Date: 2015-04-22 05:50+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -35,7 +35,7 @@ msgstr "_Mot de passe :"
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:8
 msgid "Front and Back"
-msgstr "Recto verso"
+msgstr "Recto-verso"
 
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:10
@@ -87,7 +87,7 @@ msgstr "Photo"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
 msgid "Reorder Pages"
 msgstr "Réorganiser les pages"
 
@@ -104,12 +104,12 @@ msgstr "_Page"
 #. Menu item to rotate page to left (anti-clockwise)
 #: ../data/simple-scan.ui.h:34
 msgid "Rotate _Left"
-msgstr "Pivoter vers la _gauche"
+msgstr "Faire pivoter vers la _gauche"
 
 #. Menu item to rotate page to right (clockwise)
 #: ../data/simple-scan.ui.h:36
 msgid "Rotate _Right"
-msgstr "Pivoter vers la _droite"
+msgstr "Faire pivoter vers la _droite"
 
 #. Label for page crop submenu
 #: ../data/simple-scan.ui.h:38
@@ -159,17 +159,17 @@ msgstr "_Personnalisé"
 #. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:56
 msgid "_Rotate Crop"
-msgstr "Pivote_r la selection"
+msgstr "Faire pivote_r la sélection"
 
 #. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:58
 msgid "Move Left"
-msgstr "Déplacer à gauche"
+msgstr "Déplacer vers la gauche"
 
 #. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:60
 msgid "Move Right"
-msgstr "Déplacer à droite"
+msgstr "Déplacer vers la droite"
 
 #. Label on help menu
 #: ../data/simple-scan.ui.h:62
@@ -193,7 +193,7 @@ msgstr "Nouveau"
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:69
 msgid "Scan a single page from the scanner"
-msgstr "Numériser une seule page depuis le scanner"
+msgstr "Numériser une seule page depuis le numériseur de document"
 
 #. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:71
@@ -205,7 +205,7 @@ msgstr "Numériser"
 msgid "Save document to a file"
 msgstr "Enregistrer le document dans un fichier"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -221,23 +221,22 @@ msgstr "Arrêter"
 #. Tooltip for rotate left (counter-clockwise) button
 #: ../data/simple-scan.ui.h:79
 msgid "Rotate the page to the left (counter-clockwise)"
-msgstr ""
-"Pivoter la page vers la gauche (sens inverse des aiguilles d'une montre)"
+msgstr "Faire pivoter la page vers la gauche (sens antihoraire)"
 
 #. Label on rotate page left (anti-clockwise) item
 #: ../data/simple-scan.ui.h:81
 msgid "Rotate Left"
-msgstr "Pivoter vers la gauche"
+msgstr "Faire pivoter vers la gauche"
 
 #. Tooltip for rotate right (clockwise) button
 #: ../data/simple-scan.ui.h:83
 msgid "Rotate the page to the right (clockwise)"
-msgstr "Pivoter la page vers la droite (sens des aiguilles d'une montre)"
+msgstr "Faire pivoter la page vers la droite (sens horaire)"
 
 #. Label on rotate page right (clockwise) item
 #: ../data/simple-scan.ui.h:85
 msgid "Rotate Right"
-msgstr "Pivoter vers la droite"
+msgstr "Faire pivoter vers la droite"
 
 #: ../data/simple-scan.ui.h:86
 msgid "Crop the selected page"
@@ -248,7 +247,7 @@ msgid "Crop"
 msgstr "Recadrer"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -265,7 +264,7 @@ msgstr "Résolution pour le _texte :"
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:95
 msgid "_Photo Resolution:"
-msgstr "Résolution pour la _photo :"
+msgstr "Résolution de la _photo :"
 
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:97
@@ -275,7 +274,7 @@ msgstr "Face à numériser :"
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:99
 msgid "Page Size:"
-msgstr "Taille de page :"
+msgstr "Taille de la page :"
 
 #. Label beside brightness scale
 #: ../data/simple-scan.ui.h:101
@@ -296,13 +295,32 @@ msgstr "Qualité :"
 msgid "Document Scanner"
 msgstr "Numériseur de documents"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "Numériser des documents"
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
-msgstr "scanner;numériseur;à plat;adf;"
+msgstr "numériser;périphérique de numérisation;numériseur;à plat;adf;"
+
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Une façon très simple de numériser à la fois documents et photos. Vous "
+"pouvez recadrer une photo et la faire pivoter si elle est dans le mauvais "
+"sens. Vous pouvez imprimer vos numérisations, les exporter au format pdf ou "
+"les enregistrer dans d'autres formats d'image."
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Simple Scan utilise la structure logicielle de SANE pour prendre en charge "
+"la plupart des périphériques de numérisation existants."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
@@ -314,7 +332,7 @@ msgstr "Périphérique SANE à utiliser pour l'acquisition des images."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
-msgstr "Nature du document qui va être numérisé"
+msgstr "Type de document numérisé"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
@@ -354,7 +372,7 @@ msgstr "Luminosité de la numérisation"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "Ajustement de la luminosité de -100 à 100 (0 pour aucun)."
+msgstr "L'ajustement de la luminosité de -100 à 100 (0 pour aucun)."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
@@ -362,7 +380,7 @@ msgstr "Contraste de la numérisation"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "Ajustement du contraste de -100 à 100 (0 pour aucun)."
+msgstr "L'ajustement du contraste de -100 à 100 (0 pour aucun)."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
@@ -390,7 +408,7 @@ msgstr "Face(s) de la page à numériser"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
-msgstr "Le côté de la page à numériser."
+msgstr "La face de la page à numériser."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
@@ -400,8 +418,8 @@ msgstr "Dossier dans lequel les fichiers sont enregistrés"
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
-"Le dossier où les fichiers sont enregistrés. S'il n'est pas défini, le "
-"dossier documents sera utilisé par défaut."
+"Le dossier dans lequel les fichiers sont enregistrés. S'il n'est pas défini, "
+"le dossier « Documents » sera utilisé par défaut."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
@@ -420,7 +438,7 @@ msgstr ""
 #. Error displayed when cannot connect to scanner
 #: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
-msgstr "Impossible de se connecter au scanner"
+msgstr "Impossible de se connecter au périphérique de numérisation"
 
 #. Error display when unable to start scan
 #: ../src/scanner.vala:1222
@@ -430,12 +448,12 @@ msgstr "Impossible de démarrer la numérisation"
 #. Error displayed when communication with scanner broken
 #: ../src/scanner.vala:1235 ../src/scanner.vala:1332
 msgid "Error communicating with scanner"
-msgstr "Erreur de communication avec le scanner"
+msgstr "Erreur de communication avec le périphérique de numérisation"
 
 #. Help string for command line --version flag
 #: ../src/simple-scan.vala:21
 msgid "Show release version"
-msgstr "Affiche la version du logiciel"
+msgstr "Afficher les informations de version"
 
 #. Help string for command line --debug flag
 #: ../src/simple-scan.vala:24
@@ -458,12 +476,12 @@ msgid "Scanned Document"
 msgstr "Document numérisé"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:541
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Outil de numérisation"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:552
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
@@ -474,7 +492,7 @@ msgstr ""
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf numérisé"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1735
+#: ../src/ui.vala:316 ../src/ui.vala:1745
 msgid "_Close"
 msgstr "_Fermer"
 
@@ -487,17 +505,19 @@ msgstr "Nom d'utilisateur et mot de passe nécessaires pour accéder à « %s 
 #. Warning displayed when no scanners are detected
 #: ../src/ui.vala:369
 msgid "No scanners detected"
-msgstr "Aucun scanner n'a été détecté."
+msgstr "Aucun périphérique de numérisation n'a été détecté."
 
 #. Hint to user on why there are no scanners detected
 #: ../src/ui.vala:371
 msgid "Please check your scanner is connected and powered on"
-msgstr "Veuillez vérifier que votre scanner est connecté et sous tension."
+msgstr ""
+"Veuillez vérifier que votre périphérique de numérisation est connecté et "
+"sous tension."
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1691
+#: ../src/ui.vala:507 ../src/ui.vala:1695
 msgid "Save As..."
-msgstr "Enregistrer sous…"
+msgstr "Enregistrer sous..."
 
 #: ../src/ui.vala:510 ../src/ui.vala:672
 msgid "_Cancel"
@@ -505,12 +525,12 @@ msgstr "_Annuler"
 
 #: ../src/ui.vala:511 ../src/ui.vala:673
 msgid "_Save"
-msgstr "_Sauvegarder"
+msgstr "_Enregistrer"
 
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:521
 msgid "Image Files"
-msgstr "Fichiers images"
+msgstr "Fichiers image"
 
 #. Save dialog: Filter name to show all files
 #: ../src/ui.vala:527
@@ -520,12 +540,12 @@ msgstr "Tous les fichiers"
 #. 
 #: ../src/ui.vala:532
 msgid "Select File _Type"
-msgstr "Sélectionnez le _type de fichier"
+msgstr "Sélectionner le _type de fichier"
 
 #. Save dialog: Label for saving in PDF format
 #: ../src/ui.vala:546
 msgid "PDF (multi-page document)"
-msgstr "PDF (document multi-pages)"
+msgstr "PDF (document multipage)"
 
 #. Save dialog: Label for saving in JPEG format
 #: ../src/ui.vala:552
@@ -616,7 +636,7 @@ msgstr ""
 "\n"
 "Ce programme est distribué dans l'espoir d'être utile, mais\n"
 "SANS AUCUNE GARANTIE, y compris les garanties de \n"
-"COMMERCIALISATION ou d'ADAPTATION A UN BUT SPÉCIFIQUE.\n"
+"COMMERCIALISATION ou d'ADAPTATION À UN BUT SPÉCIFIQUE.\n"
 "Consultez la licence publique générale GNU pour plus de détails.\n"
 "\n"
 "Vous devez avoir reçu une copie de la licence publique générale GNU\n"
@@ -709,73 +729,73 @@ msgstr "%d ppp (haute résolution)"
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#: ../src/ui.vala:1683
+#: ../src/ui.vala:1687
 msgid "New Document"
 msgstr "Nouveau document"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1692
 msgid "Document"
 msgstr "Document"
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1696
 msgid "Email..."
-msgstr "Courrier électronique..."
+msgstr "Courriel..."
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1697
 msgid "Print..."
-msgstr "Imprimer…"
+msgstr "Imprimer..."
 
-#: ../src/ui.vala:1701
+#: ../src/ui.vala:1705
 msgid "Help"
 msgstr "Aide"
 
-#: ../src/ui.vala:1702
+#: ../src/ui.vala:1706
 msgid "About"
 msgstr "À propos"
 
-#: ../src/ui.vala:1703
+#: ../src/ui.vala:1707
 msgid "Quit"
 msgstr "Quitter"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1737
+#: ../src/ui.vala:1747
 msgid "Change _Scanner"
-msgstr "Changer de _scanner"
+msgstr "Changer de _périphérique de numérisation"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1743
+#: ../src/ui.vala:1753
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../src/ui.vala:1793
+#: ../src/ui.vala:1803
 msgid "Darker"
 msgstr "Plus foncé"
 
-#: ../src/ui.vala:1795
+#: ../src/ui.vala:1805
 msgid "Lighter"
 msgstr "Plus clair"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1813
 msgid "Less"
 msgstr "Moins"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1815
 msgid "More"
 msgstr "Plus"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1823
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1825
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1856
+#: ../src/ui.vala:1866
 msgid "Saving document..."
-msgstr "Enregistrement du document…"
+msgstr "Enregistrement du document..."
 
-#: ../src/ui.vala:2019
+#: ../src/ui.vala:2016
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrement de la page %d sur %d"
diff --git a/po/gd.po b/po/gd.po
index a1319d5..0aefe31 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Gaelic; Scottish <gd@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "A cùl"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Sganadh simplidh"
 
@@ -303,6 +304,19 @@ msgstr "Sganaich sgrìobhainnean"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "An t-uidheam a nì an sganadh"
diff --git a/po/gl.po b/po/gl.po
index 0f192a9..a90180a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2013-10-05 07:56+0000\n"
 "Last-Translator: Fran Diéguez <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Atrás"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Escaner sinxelo"
 
@@ -293,7 +294,7 @@ msgstr "Calidade:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "Escáner de documentos"
 
 #: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
@@ -301,6 +302,19 @@ msgstr "Escanear documentos"
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
+msgstr "escanear;escáner;flatbed;adf;"
+
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
diff --git a/po/he.po b/po/he.po
index f804c38..0db189f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 09:01+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "גב"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "סריקה פשוטה"
 
@@ -303,6 +304,19 @@ msgstr "סריקת מסמכים"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Device to scan from"
diff --git a/po/hr.po b/po/hr.po
index 4824741..7e791b8 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 09:01+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Natrag"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Jednostavno skeniranje"
 
@@ -303,6 +304,19 @@ msgstr "Skenirajte dokumente"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Uređaj za skeniranje"
diff --git a/po/hu.po b/po/hu.po
index 5105bcc..0cdd502 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2014-02-18 14:14+0000\n"
 "Last-Translator: Gabor Kelemen <kelemeng@openscope.org>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Hátlap"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
@@ -303,6 +304,19 @@ msgstr "Dokumentumok szkennelése"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "szkennelés;szkenner;beolvasó;síkágyas;adf;"
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "A szkennelő eszkőz"
diff --git a/po/hy.po b/po/hy.po
index 761d45a..697c0d7 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Armenian <hy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Ետ"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
@@ -303,6 +304,19 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 9238ffc..9e22aec 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2014-01-18 00:43+0000\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Belakang"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Pemindai Ringkas"
 
@@ -303,6 +304,19 @@ msgstr "Pindai Dokumen"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Perangkat untuk memindai"
diff --git a/po/it.po b/po/it.po
index 91567ca..a0791fa 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-08-22 07:09+0000\n"
 "Last-Translator: Leonardo Corato <leocor@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Retro"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
@@ -293,7 +294,7 @@ msgstr "Qualità:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "Scansiona documenti"
 
 #: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
@@ -301,6 +302,19 @@ msgstr "Acquisisci documenti"
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;scansiona;adf;"
+
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
diff --git a/po/ja.po b/po/ja.po
index 175e0a1..83607bd 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2014-11-20 05:14+0000\n"
 "Last-Translator: Kentaro Kazuhama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "戻る"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "シンプルスキャン"
 
@@ -303,6 +304,19 @@ msgstr "ドキュメントをスキャンします"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "スキャンするデバイス"
diff --git a/po/kk.po b/po/kk.po
index be3d74c..6c1fc6b 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Сырты"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
@@ -303,6 +304,19 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
diff --git a/po/km.po b/po/km.po
index 17159e3..8100f4f 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Khmer <km@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "ថយក្រោយ"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "ស្កេន​ធម្មតា"
 
@@ -293,7 +294,7 @@ msgstr "គុណភាព ៖"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "ម៉ាស៊ីនស្កេនឯកសារ"
 
 #: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
@@ -301,6 +302,19 @@ msgstr "ស្កេន​ឯកសារ"
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
+msgstr "ស្កេន;ម៉ាស៊ីនស្កេន;flatbed;adf;"
+
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
diff --git a/po/ky.po b/po/ky.po
index 2619302..79e183d 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Kirghiz <ky@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr ""
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
@@ -303,6 +304,19 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 8d03acc..c531bb1 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 09:03+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr ""
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
@@ -303,6 +304,19 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
diff --git a/po/lv.po b/po/lv.po
index 703f22c..d616863 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-10-07 21:28+0000\n"
 "Last-Translator: Rūdolfs Mazurs <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Aizmugure"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Vienkārša skenēšana"
 
@@ -303,6 +304,19 @@ msgstr "Skenēt dokumentus"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Ierīce, no kuras skenēt"
diff --git a/po/mhr.po b/po/mhr.po
index 3168345..4b75f9a 100644
--- a/po/mhr.po
+++ b/po/mhr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Mari (Meadow) <mhr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr ""
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
@@ -303,6 +304,19 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
diff --git a/po/ms.po b/po/ms.po
index d01972b..187555f 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 09:04+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Malay <ms@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Ke belakang"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Pengimbas Ringkas"
 
@@ -293,7 +294,7 @@ msgstr "Kualiti:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "Pengimbas dokumen"
 
 #: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
@@ -303,6 +304,19 @@ msgstr "Imbas Dokumen"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Peranti untuk diimbas dari"
@@ -632,7 +646,8 @@ msgstr ""
 "  Khairul Aizat Kamarudzzaman https://launchpad.net/~fenris\n"
 "  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
 "  abuyop https://launchpad.net/~abuyop\n"
-"  ahmad akmal bin mohd idris https://launchpad.net/~mamahopsk87"
+"  ahmad akmal bin mohd idris https://launchpad.net/~mamahopsk87\n"
+"  dequan https://launchpad.net/~dequan"
 
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.vala:1506
diff --git a/po/my.po b/po/my.po
index 82b3d40..1783cfc 100644
--- a/po/my.po
+++ b/po/my.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Burmese <my@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "နောက်သို့"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "ရိုးရိုး Scan ဖတ်ခြင်း"
 
@@ -303,6 +304,19 @@ msgstr "Scan Documents"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "ဘယ်ကိရိယာမှ Scan ဖတ်မည်..."
diff --git a/po/nb.po b/po/nb.po
index 64a4bae..8e1091e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2014-09-02 16:41+0000\n"
 "Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Bakside"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
@@ -303,6 +304,19 @@ msgstr "Skann dokumenter"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "skan;skanner;plan;adf;"
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Enhet det skal skannes fra"
diff --git a/po/nl.po b/po/nl.po
index 6def84c..dd9c792 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 09:04+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Achterzijde"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Scannen"
 
@@ -293,7 +294,7 @@ msgstr "Kwaliteit:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "Documentenscanner"
 
 #: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
@@ -301,6 +302,19 @@ msgstr "Documenten scannen"
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbed;adf;"
+
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
diff --git a/po/oc.po b/po/oc.po
index 1d7f8c0..20558bc 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2013-10-15 16:43+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Precedenta"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Aisina de numerizacion simpla"
 
@@ -304,6 +305,19 @@ msgstr "Numerizar de documents"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Numerizar dempuèi"
diff --git a/po/pa.po b/po/pa.po
index 1edf88e..6c37c30 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Punjabi <pa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "ਪਿੱਛੇ"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "ਸੌਖਾ ਸਕੈਨ"
 
@@ -303,6 +304,19 @@ msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "ਸਕੈਨ ਕਰਨ ਲਈ ਜੰਤਰ"
diff --git a/po/pl.po b/po/pl.po
index 0f6c402..e9cd976 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
-"PO-Revision-Date: 2015-01-21 16:34+0000\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
+"PO-Revision-Date: 2015-04-16 21:56+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-17 05:17+0000\n"
+"X-Generator: Launchpad (build 17430)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Tył"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Proste skanowanie"
 
@@ -303,6 +304,24 @@ msgstr "Skanowanie dokumentów"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "skan;skanowanie;skaner;scan;scanner;flatbed;adf;"
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"Bardzo prosty sposób na skanowanie dokumentów i zdjęć. Umożliwia kadrowanie "
+"i obracanie zdjęć, drukowanie, eksportowanie do formatu PDF oraz zapisywanie "
+"w wielu formatach."
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+"Program Simple Scan używa mechanizmu SANE do obsługi większości istniejących "
+"skanerów."
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Urządzenie skanujące"
diff --git a/po/pt.po b/po/pt.po
index c0fafdb..6ec8dbe 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2014-07-24 15:38+0000\n"
 "Last-Translator: Paulo Henriques <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Verso"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Digitalização Simples"
 
@@ -293,7 +294,7 @@ msgstr "Qualidade:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "Scanner de Documentos"
 
 #: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
@@ -301,6 +302,19 @@ msgstr "Digitalizar Documentos"
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbed;adf;"
+
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
@@ -634,6 +648,7 @@ msgstr ""
 "  Alexandre Fidalgo https://launchpad.net/~alexandremagnos15\n"
 "  Almufadado https://launchpad.net/~almufadado\n"
 "  André Lopes https://launchpad.net/~zipatei\n"
+"  António Miranda https://launchpad.net/~antoniom0910\n"
 "  António PT https://launchpad.net/~antoniopt\n"
 "  Carlos Manuel https://launchpad.net/~crolidge\n"
 "  Claudio Novais https://launchpad.net/~claudiocn\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 64845f3..0843e77 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2013-04-16 12:21+0000\n"
 "Last-Translator: Neliton Pereira Jr. <nelitonpjr@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Verso"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Digitalizador simples"
 
@@ -303,6 +304,19 @@ msgstr "Digitalizar documentos"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispositivo de onde digitalizar"
diff --git a/po/ro.po b/po/ro.po
index 6070bb3..6050b71 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-09-11 18:43+0000\n"
 "Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 "Language: ro\n"
 
 #. Button to submit authorization dialog
@@ -50,6 +50,7 @@ msgstr "Verso"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Scanare simplă"
 
@@ -304,6 +305,19 @@ msgstr "Scanează documente"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Dispozitiv de folosit pentru scanare"
diff --git a/po/ru.po b/po/ru.po
index f1cb11d..5cae89f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2014-07-10 05:43+0000\n"
 "Last-Translator: ☠Jay ZDLin☠ <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Обратная сторона"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Простое сканирование"
 
@@ -303,6 +304,19 @@ msgstr "Сканирование документов"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "сканировать;сканер;планшетный;автоподатчик;"
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Устройство сканирования"
diff --git a/po/sd.po b/po/sd.po
index 4e4fc1a..cd8868e 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Sindhi <sd@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "پوئتي"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "سادو اسڪين"
 
@@ -303,6 +304,19 @@ msgstr "دستاويزات اسڪين ڪريو"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "اسڪين ڪرڻ لاءِ اوزار"
diff --git a/po/se.po b/po/se.po
index a02ef5d..103576e 100644
--- a/po/se.po
+++ b/po/se.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-08-18 11:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Northern Sami <se@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Maŋos"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
@@ -303,6 +304,19 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
diff --git a/po/shn.po b/po/shn.po
index 6ca0b1d..3bc594a 100644
--- a/po/shn.po
+++ b/po/shn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Shan <shn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr ""
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
@@ -303,6 +304,19 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 1da7f75..c0c0418 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 09:07+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr ""
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Jednoduché skenovanie"
 
@@ -303,6 +304,19 @@ msgstr "Skenovať dokumenty"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Zariadenie z ktorého skenovať"
diff --git a/po/sl.po b/po/sl.po
index efdc92c..5c61a69 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 09:19+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Hrbtna stran"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Enostavno optično branje"
 
@@ -89,7 +90,7 @@ msgstr "Fotografija"
 #. Title of dialog to reorder pages
 #: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Prerazporeditev strani"
 
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:30
@@ -303,6 +304,19 @@ msgstr "Optično preberite dokumente"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Naprava za optično branje"
@@ -560,12 +574,12 @@ msgstr "Ni mogoče odpreti programa predogleda slik"
 #. Label on button for combining sides in reordering dialog
 #: ../src/ui.vala:1203
 msgid "Combine sides"
-msgstr ""
+msgstr "Spoji strani"
 
 #. Label on button for combining sides in reverse order in reordering dialog
 #: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Spoji strani (obratno)"
 
 #. Label on button for reversing in reordering dialog
 #: ../src/ui.vala:1223
@@ -575,7 +589,7 @@ msgstr "Obrnjeno"
 #. Label on button for cancelling page reordering dialog
 #: ../src/ui.vala:1233
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Ohrani nespremenjeno"
 
 #. Error message displayed when unable to launch help browser
 #: ../src/ui.vala:1448
diff --git a/po/sq.po b/po/sq.po
index 7a2007f..702476a 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 09:08+0000\n"
 "Last-Translator: Alket Rexhepi <alketii@gmail.com>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Mbrapa"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Skanim i thjeshtë"
 
@@ -303,6 +304,19 @@ msgstr "Skanoj Dokumentet"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Paisje për te skanuar prej"
diff --git a/po/sr.po b/po/sr.po
index 2e2d576..87b6c39 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2014-02-28 14:28+0000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:13+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 "Language: sr\n"
 
 #. Button to submit authorization dialog
@@ -49,6 +49,7 @@ msgstr "Позадина"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Обично скенирање"
 
@@ -303,6 +304,19 @@ msgstr "Скенирајте документе"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Уређај са ког ће се скенирати"
diff --git a/po/sv.po b/po/sv.po
index a7b6053..2554b4e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2015-03-13 01:21+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-14 05:13+0000\n"
-"X-Generator: Launchpad (build 17389)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Baksida"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Enkel bildinläsning"
 
@@ -303,6 +304,19 @@ msgstr "Läs in dokument"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbädd;adf;skan;skanner;"
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Enhet att läsa in från"
diff --git a/po/ta.po b/po/ta.po
index a416906..b5b3aab 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2014-03-22 13:36+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Tamil <ta@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "பின் செல்க"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
@@ -303,6 +304,19 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index 972380d..501e4d1 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 09:08+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Telugu <te@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "వెనుకకు"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "సింపుల్ స్కాన్"
 
@@ -303,6 +304,19 @@ msgstr "పత్రాలు స్కాన్ చేయు"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "స్కాన్ చేయుటకు పరికరం"
diff --git a/po/th.po b/po/th.po
index 9d3b19b..ffed4f3 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 09:09+0000\n"
 "Last-Translator: AnuchitChalothorn <anoochit@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "หลัง"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
@@ -303,6 +304,19 @@ msgstr "สแกนเอกสาร"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "เครื่องสแกนจาก"
diff --git a/po/tr.po b/po/tr.po
index a856a8f..a99b21e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 09:09+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Arka taraf"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Basit Tarama"
 
@@ -303,6 +304,19 @@ msgstr "Belgeleri Tara"
 msgid "scan;scanner;flatbed;adf;"
 msgstr "tara;tarayıcı;flatbed;adf;"
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Tarama yapılacak aygıt"
diff --git a/po/ug.po b/po/ug.po
index e4715c8..b00e444 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-08-07 01:17+0000\n"
 "Last-Translator: Sahran <Unknown>\n"
 "Language-Team: Uyghur Computer Science Association <ubuntu-l10n-"
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 "X-Poedit-Language: Uighur\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
@@ -52,6 +52,7 @@ msgstr "كەينى"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "ئاددىي شويلىلاش"
 
@@ -306,6 +307,19 @@ msgstr "پۈتۈك شويلىلاش"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "شويلىلايدىغان ئۈسكۈنە"
diff --git a/po/uk.po b/po/uk.po
index 6bb4e60..013b73e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 11:28+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Зворот"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Просте сканування"
 
@@ -304,6 +305,19 @@ msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 "scan;scanner;flatbed;adf;сканування;сканер;планшет;двобічне;автоматичне;"
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Пристрій сканування"
diff --git a/po/ur.po b/po/ur.po
index a0fd90c..eb2773a 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Urdu <ur@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "پیچھے"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr ""
 
@@ -303,6 +304,19 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
index e7eb072..e30d304 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Uzbek <uz@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "Orqaga"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Simple Scan"
 
@@ -303,6 +304,19 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 394e52d..5749f38 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-07-23 09:09+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr ""
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "Quét đơn giản"
 
@@ -303,6 +304,19 @@ msgstr ""
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 603fbda..4d33225 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-09-20 08:05+0000\n"
 "Last-Translator: Dennis Kuang <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "背面"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "扫描易"
 
@@ -303,6 +304,19 @@ msgstr "扫描文档"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "扫描设备"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b94fe73..64c945d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-01-15 10:02+1300\n"
+"POT-Creation-Date: 2015-04-15 12:17+1200\n"
 "PO-Revision-Date: 2012-10-25 09:21+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-03-09 05:43+0000\n"
-"X-Generator: Launchpad (build 17383)\n"
+"X-Launchpad-Export-Date: 2015-04-16 05:14+0000\n"
+"X-Generator: Launchpad (build 17428)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,6 +49,7 @@ msgstr "背面"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
+#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "掃描易"
 
@@ -303,6 +304,19 @@ msgstr "掃描文件"
 msgid "scan;scanner;flatbed;adf;"
 msgstr ""
 
+#: ../data/simple-scan.appdata.xml.in.h:2
+msgid ""
+"A really easy way to scan both documents and photos. You can crop out the "
+"bad parts of a photo and rotate it if it is the wrong way round. You can "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+
+#: ../data/simple-scan.appdata.xml.in.h:3
+msgid ""
+"Simple Scan uses the SANE framework to support most existing scanners."
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "要從哪個裝置掃描"
@@ -563,7 +577,7 @@ msgstr ""
 #. Label on button for reversing in reordering dialog
 #: ../src/ui.vala:1223
 msgid "Reverse"
-msgstr ""
+msgstr "反轉"
 
 #. Label on button for cancelling page reordering dialog
 #: ../src/ui.vala:1233
diff --git a/src/autosave-manager.c b/src/autosave-manager.c
index c7a0dcc..3c36bfe 100644
--- a/src/autosave-manager.c
+++ b/src/autosave-manager.c
@@ -183,14 +183,14 @@ static gint _vala_array_length (gpointer array);
 
 
 static void _page_unref0_ (gpointer var) {
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	(var == NULL) ? NULL : (var = (page_unref (var), NULL));
 #line 189 "autosave-manager.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	var = (g_free (var), NULL);
 #line 196 "autosave-manager.c"
 }
@@ -201,33 +201,33 @@ AutosaveManager* autosave_manager_construct (GType object_type) {
 	GHashFunc _tmp0_ = NULL;
 	GEqualFunc _tmp1_ = NULL;
 	GHashTable* _tmp2_ = NULL;
-#line 57 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self = (AutosaveManager*) g_type_create_instance (object_type);
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = g_direct_hash;
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp1_ = g_direct_equal;
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp2_ = g_hash_table_new_full (_tmp0_, _tmp1_, _page_unref0_, _g_free0_);
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_hash_table_unref0 (self->priv->page_filenames);
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->priv->page_filenames = _tmp2_;
-#line 57 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return self;
 #line 219 "autosave-manager.c"
 }
 
 
 AutosaveManager* autosave_manager_new (void) {
-#line 57 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return autosave_manager_construct (TYPE_AUTOSAVE_MANAGER);
 #line 226 "autosave-manager.c"
 }
 
 
 static gpointer _page_ref0 (gpointer self) {
-#line 152 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return self ? page_ref (self) : NULL;
 #line 233 "autosave-manager.c"
 }
@@ -246,35 +246,35 @@ void autosave_manager_load (AutosaveManager* self) {
 	gchar** _tmp12_ = NULL;
 	gchar** _tmp13_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 62 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 64 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_debug ("autosave-manager.vala:64: Loading autosave information");
-#line 66 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = autosave_manager_get_book (self);
-#line 66 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp1_ = _tmp0_;
-#line 66 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	book_clear (_tmp1_);
-#line 67 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp2_ = self->priv->page_filenames;
-#line 67 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_hash_table_remove_all (_tmp2_);
-#line 69 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp3_ = g_key_file_new ();
-#line 69 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	file = _tmp3_;
 #line 268 "autosave-manager.c"
 	{
 		GKeyFile* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 72 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp4_ = file;
-#line 72 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp5_ = autosave_manager_AUTOSAVE_PATH;
-#line 72 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_key_file_load_from_file (_tmp4_, _tmp5_, G_KEY_FILE_NONE, &_inner_error_);
-#line 72 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 280 "autosave-manager.c"
 			goto __catch27_g_error;
@@ -285,56 +285,56 @@ void autosave_manager_load (AutosaveManager* self) {
 	{
 		GError* e = NULL;
 		GError* _tmp6_ = NULL;
-#line 70 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 70 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 76 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp6_ = e;
-#line 76 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (!g_error_matches (_tmp6_, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
 #line 297 "autosave-manager.c"
 			GError* _tmp7_ = NULL;
 			const gchar* _tmp8_ = NULL;
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			_tmp7_ = e;
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			_tmp8_ = _tmp7_->message;
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			g_warning ("autosave-manager.vala:77: Could not load autosave infomation; not rest" \
 "oring any autosaves: %s", _tmp8_);
 #line 306 "autosave-manager.c"
 		}
-#line 78 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
-#line 78 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_key_file_unref0 (file);
-#line 78 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
 #line 314 "autosave-manager.c"
 	}
 	__finally27:
-#line 70 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 70 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_key_file_unref0 (file);
-#line 70 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.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 70 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_clear_error (&_inner_error_);
-#line 70 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
 #line 327 "autosave-manager.c"
 	}
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp9_ = file;
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp10_ = autosave_manager_get_value (self, _tmp9_, "simple-scan", "pages", "");
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	pages = _tmp10_;
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp11_ = pages;
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp13_ = _tmp12_ = g_strsplit (_tmp11_, " ", 0);
 #line 339 "autosave-manager.c"
 	{
@@ -342,18 +342,18 @@ void autosave_manager_load (AutosaveManager* self) {
 		gint page_name_collection_length1 = 0;
 		gint _page_name_collection_size_ = 0;
 		gint page_name_it = 0;
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		page_name_collection = _tmp13_;
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		page_name_collection_length1 = _vala_array_length (_tmp12_);
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		for (page_name_it = 0; page_name_it < _vala_array_length (_tmp12_); page_name_it = page_name_it + 1) {
 #line 351 "autosave-manager.c"
 			gchar* _tmp14_ = NULL;
 			gchar* page_name = NULL;
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			_tmp14_ = g_strdup (page_name_collection[page_name_it]);
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			page_name = _tmp14_;
 #line 358 "autosave-manager.c"
 			{
@@ -390,13 +390,13 @@ void autosave_manager_load (AutosaveManager* self) {
 				const gchar* _tmp37_ = NULL;
 				const gchar* _tmp38_ = NULL;
 				GQuark _tmp40_ = 0U;
-#line 93 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				static GQuark _tmp39_label0 = 0;
-#line 93 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				static GQuark _tmp39_label1 = 0;
-#line 93 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				static GQuark _tmp39_label2 = 0;
-#line 93 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				static GQuark _tmp39_label3 = 0;
 #line 401 "autosave-manager.c"
 				gchar* color_profile = NULL;
@@ -463,221 +463,221 @@ void autosave_manager_load (AutosaveManager* self) {
 				Book* _tmp97_ = NULL;
 				Book* _tmp98_ = NULL;
 				Page* _tmp99_ = NULL;
-#line 83 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp15_ = page_name;
-#line 83 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				g_debug ("autosave-manager.vala:83: Loading automatically saved page %s", _tmp15_);
-#line 85 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp16_ = file;
-#line 85 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp17_ = page_name;
-#line 85 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp18_ = autosave_manager_get_integer (self, _tmp16_, _tmp17_, "scan-width", 0);
-#line 85 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				scan_width = _tmp18_;
-#line 86 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp19_ = file;
-#line 86 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp20_ = page_name;
-#line 86 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp21_ = autosave_manager_get_integer (self, _tmp19_, _tmp20_, "scan-height", 0);
-#line 86 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				scan_height = _tmp21_;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp22_ = file;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp23_ = page_name;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp24_ = autosave_manager_get_integer (self, _tmp22_, _tmp23_, "rowstride", 0);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				rowstride = _tmp24_;
-#line 88 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp25_ = file;
-#line 88 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp26_ = page_name;
-#line 88 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp27_ = autosave_manager_get_integer (self, _tmp25_, _tmp26_, "n-channels", 0);
-#line 88 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				n_channels = _tmp27_;
-#line 89 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp28_ = file;
-#line 89 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp29_ = page_name;
-#line 89 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp30_ = autosave_manager_get_integer (self, _tmp28_, _tmp29_, "depth", 0);
-#line 89 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				depth = _tmp30_;
-#line 90 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp31_ = file;
-#line 90 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp32_ = page_name;
-#line 90 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp33_ = autosave_manager_get_integer (self, _tmp31_, _tmp32_, "dpi", 0);
-#line 90 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				dpi = _tmp33_;
-#line 91 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp34_ = file;
-#line 91 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp35_ = page_name;
-#line 91 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp36_ = autosave_manager_get_value (self, _tmp34_, _tmp35_, "scan-direction", "");
-#line 91 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				scan_direction_name = _tmp36_;
-#line 92 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 93 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp37_ = scan_direction_name;
-#line 93 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp38_ = _tmp37_;
-#line 93 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp40_ = (NULL == _tmp38_) ? 0 : g_quark_from_string (_tmp38_);
-#line 93 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				if (_tmp40_ == ((0 != _tmp39_label0) ? _tmp39_label0 : (_tmp39_label0 = g_quark_from_static_string ("TOP_TO_BOTTOM")))) {
-#line 93 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					switch (0) {
 #line 538 "autosave-manager.c"
 						default:
 						{
-#line 96 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 							scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 97 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 							break;
 #line 545 "autosave-manager.c"
 						}
 					}
 				} else if (_tmp40_ == ((0 != _tmp39_label1) ? _tmp39_label1 : (_tmp39_label1 = g_quark_from_static_string ("LEFT_TO_RIGHT")))) {
-#line 93 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					switch (0) {
 #line 551 "autosave-manager.c"
 						default:
 						{
-#line 99 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 							scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
-#line 100 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 							break;
 #line 558 "autosave-manager.c"
 						}
 					}
 				} else if (_tmp40_ == ((0 != _tmp39_label2) ? _tmp39_label2 : (_tmp39_label2 = g_quark_from_static_string ("BOTTOM_TO_TOP")))) {
-#line 93 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					switch (0) {
 #line 564 "autosave-manager.c"
 						default:
 						{
-#line 102 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 							scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 							break;
 #line 571 "autosave-manager.c"
 						}
 					}
 				} else if (_tmp40_ == ((0 != _tmp39_label3) ? _tmp39_label3 : (_tmp39_label3 = g_quark_from_static_string ("RIGHT_TO_LEFT")))) {
-#line 93 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					switch (0) {
 #line 577 "autosave-manager.c"
 						default:
 						{
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 							scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
-#line 106 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 							break;
 #line 584 "autosave-manager.c"
 						}
 					}
 				}
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp41_ = file;
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp42_ = page_name;
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp43_ = autosave_manager_get_value (self, _tmp41_, _tmp42_, "color-profile", "");
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				color_profile = _tmp43_;
-#line 109 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp44_ = color_profile;
-#line 109 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				if (g_strcmp0 (_tmp44_, "") == 0) {
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_g_free0 (color_profile);
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					color_profile = NULL;
 #line 604 "autosave-manager.c"
 				}
-#line 111 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp45_ = file;
-#line 111 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp46_ = page_name;
-#line 111 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp47_ = autosave_manager_get_value (self, _tmp45_, _tmp46_, "pixels-filename", "");
-#line 111 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				pixels_filename = _tmp47_;
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp48_ = file;
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp49_ = page_name;
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp50_ = autosave_manager_get_boolean (self, _tmp48_, _tmp49_, "has-crop", FALSE);
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				has_crop = _tmp50_;
-#line 113 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp51_ = file;
-#line 113 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp52_ = page_name;
-#line 113 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp53_ = autosave_manager_get_value (self, _tmp51_, _tmp52_, "crop-name", "");
-#line 113 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				crop_name = _tmp53_;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp54_ = crop_name;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				if (g_strcmp0 (_tmp54_, "") == 0) {
-#line 115 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_g_free0 (crop_name);
-#line 115 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					crop_name = NULL;
 #line 638 "autosave-manager.c"
 				}
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp55_ = file;
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp56_ = page_name;
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp57_ = autosave_manager_get_integer (self, _tmp55_, _tmp56_, "crop-x", 0);
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				crop_x = _tmp57_;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp58_ = file;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp59_ = page_name;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp60_ = autosave_manager_get_integer (self, _tmp58_, _tmp59_, "crop-y", 0);
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				crop_y = _tmp60_;
-#line 118 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp61_ = file;
-#line 118 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp62_ = page_name;
-#line 118 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp63_ = autosave_manager_get_integer (self, _tmp61_, _tmp62_, "crop-width", 0);
-#line 118 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				crop_width = _tmp63_;
-#line 119 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp64_ = file;
-#line 119 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp65_ = page_name;
-#line 119 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp66_ = autosave_manager_get_integer (self, _tmp64_, _tmp65_, "crop-height", 0);
-#line 119 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				crop_height = _tmp66_;
-#line 121 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				pixels = NULL;
-#line 121 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				pixels_length1 = 0;
-#line 121 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_pixels_size_ = pixels_length1;
-#line 122 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp67_ = pixels_filename;
-#line 122 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				if (g_strcmp0 (_tmp67_, "") != 0) {
 #line 682 "autosave-manager.c"
 					gchar* path = NULL;
@@ -687,38 +687,38 @@ void autosave_manager_load (AutosaveManager* self) {
 					GFile* f = NULL;
 					const gchar* _tmp71_ = NULL;
 					GFile* _tmp72_ = NULL;
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp68_ = autosave_manager_AUTOSAVE_DIR;
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp69_ = pixels_filename;
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp70_ = g_build_filename (_tmp68_, _tmp69_, NULL);
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					path = _tmp70_;
-#line 125 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp71_ = path;
-#line 125 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp72_ = g_file_new_for_path (_tmp71_);
-#line 125 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					f = _tmp72_;
 #line 704 "autosave-manager.c"
 					{
 						GFile* _tmp73_ = NULL;
 						guint8* _tmp74_ = NULL;
 						gsize _tmp75_;
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_tmp73_ = f;
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						g_file_load_contents (_tmp73_, NULL, &_tmp74_, &_tmp75_, NULL, &_inner_error_);
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						pixels = (g_free (pixels), NULL);
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						pixels = _tmp74_;
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						pixels_length1 = _tmp75_;
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_pixels_size_ = pixels_length1;
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 723 "autosave-manager.c"
 							goto __catch28_g_error;
@@ -728,153 +728,153 @@ void autosave_manager_load (AutosaveManager* self) {
 					__catch28_g_error:
 					{
 						GError* e = NULL;
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						e = _inner_error_;
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_inner_error_ = NULL;
-#line 132 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						g_warning ("autosave-manager.vala:132: Failed to load pixel information");
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_error_free0 (e);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_object_unref0 (f);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (path);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						pixels = (g_free (pixels), NULL);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (crop_name);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (pixels_filename);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (color_profile);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (scan_direction_name);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (page_name);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						continue;
 #line 757 "autosave-manager.c"
 					}
 					__finally28:
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_object_unref0 (f);
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (path);
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						pixels = (g_free (pixels), NULL);
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (crop_name);
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (pixels_filename);
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (color_profile);
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (scan_direction_name);
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (page_name);
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						page_name_collection = (_vala_array_free (page_name_collection, page_name_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (pages);
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_key_file_unref0 (file);
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.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 126 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						g_clear_error (&_inner_error_);
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						return;
 #line 790 "autosave-manager.c"
 					}
-#line 122 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_g_object_unref0 (f);
-#line 122 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_g_free0 (path);
 #line 796 "autosave-manager.c"
 				}
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp76_ = scan_width;
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp77_ = scan_height;
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp78_ = rowstride;
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp79_ = n_channels;
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp80_ = depth;
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp81_ = dpi;
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp82_ = scan_direction;
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp83_ = color_profile;
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp84_ = pixels;
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp84__length1 = pixels_length1;
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp85_ = has_crop;
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp86_ = crop_name;
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp87_ = crop_x;
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp88_ = crop_y;
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp89_ = crop_width;
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp90_ = crop_height;
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp91_ = page_new_from_data (_tmp76_, _tmp77_, _tmp78_, _tmp79_, _tmp80_, _tmp81_, _tmp82_, _tmp83_, _tmp84_, _tmp84__length1, _tmp85_, _tmp86_, _tmp87_, _tmp88_, _tmp89_, _tmp90_);
-#line 137 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				page = _tmp91_;
-#line 152 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp92_ = self->priv->page_filenames;
-#line 152 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp93_ = page;
-#line 152 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp94_ = _page_ref0 (_tmp93_);
-#line 152 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp95_ = pixels_filename;
-#line 152 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp96_ = g_strdup (_tmp95_);
-#line 152 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				g_hash_table_insert (_tmp92_, _tmp94_, _tmp96_);
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp97_ = autosave_manager_get_book (self);
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp98_ = _tmp97_;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp99_ = page;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				book_append_page (_tmp98_, _tmp99_);
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_page_unref0 (page);
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				pixels = (g_free (pixels), NULL);
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (crop_name);
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (pixels_filename);
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (color_profile);
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (scan_direction_name);
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (page_name);
 #line 868 "autosave-manager.c"
 			}
 		}
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		page_name_collection = (_vala_array_free (page_name_collection, page_name_collection_length1, (GDestroyNotify) g_free), NULL);
 #line 873 "autosave-manager.c"
 	}
-#line 62 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_free0 (pages);
-#line 62 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_key_file_unref0 (file);
 #line 879 "autosave-manager.c"
 }
@@ -883,15 +883,15 @@ void autosave_manager_load (AutosaveManager* self) {
 static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, const gchar* _default_) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (file != NULL, NULL);
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (group_name != NULL, NULL);
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (_default_ != NULL, NULL);
 #line 896 "autosave-manager.c"
 	{
@@ -901,30 +901,30 @@ static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file,
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp1_ = file;
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = group_name;
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp3_ = key;
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp4_ = g_key_file_get_value (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp4_;
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 916 "autosave-manager.c"
 			goto __catch29_g_error;
 		}
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp5_ = _tmp0_;
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = NULL;
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp5_;
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (_tmp0_);
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
 #line 929 "autosave-manager.c"
 	}
@@ -934,28 +934,28 @@ static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file,
 		GError* e = NULL;
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp6_ = _default_;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp7_ = g_strdup (_tmp6_);
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp7_;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
 #line 951 "autosave-manager.c"
 	}
 	__finally29:
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.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 159 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_clear_error (&_inner_error_);
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return NULL;
 #line 960 "autosave-manager.c"
 }
@@ -964,13 +964,13 @@ static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file,
 static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, gint _default_) {
 	gint result = 0;
 	GError * _inner_error_ = NULL;
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (file != NULL, 0);
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (group_name != NULL, 0);
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (key != NULL, 0);
 #line 975 "autosave-manager.c"
 	{
@@ -979,24 +979,24 @@ static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file,
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp1_ = file;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = group_name;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp3_ = key;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp4_ = g_key_file_get_integer (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp4_;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 994 "autosave-manager.c"
 			goto __catch30_g_error;
 		}
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp0_;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
 #line 1001 "autosave-manager.c"
 	}
@@ -1005,26 +1005,26 @@ static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file,
 	{
 		GError* e = NULL;
 		gint _tmp5_ = 0;
-#line 171 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 171 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 177 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp5_ = _default_;
-#line 177 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp5_;
-#line 177 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
-#line 177 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
 #line 1020 "autosave-manager.c"
 	}
 	__finally30:
-#line 171 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.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 171 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_clear_error (&_inner_error_);
-#line 171 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return 0;
 #line 1029 "autosave-manager.c"
 }
@@ -1033,13 +1033,13 @@ static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file,
 static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, gboolean _default_) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 181 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 181 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (file != NULL, FALSE);
-#line 181 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (group_name != NULL, FALSE);
-#line 181 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
 #line 1044 "autosave-manager.c"
 	{
@@ -1048,24 +1048,24 @@ static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* f
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp1_ = file;
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = group_name;
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp3_ = key;
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp4_ = g_key_file_get_boolean (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp4_;
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1063 "autosave-manager.c"
 			goto __catch31_g_error;
 		}
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp0_;
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
 #line 1070 "autosave-manager.c"
 	}
@@ -1074,26 +1074,26 @@ static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* f
 	{
 		GError* e = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 183 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 183 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 189 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp5_ = _default_;
-#line 189 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp5_;
-#line 189 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
-#line 189 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
 #line 1089 "autosave-manager.c"
 	}
 	__finally31:
-#line 183 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.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 183 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_clear_error (&_inner_error_);
-#line 183 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return FALSE;
 #line 1098 "autosave-manager.c"
 }
@@ -1103,23 +1103,23 @@ void autosave_manager_cleanup (AutosaveManager* self) {
 	guint _tmp0_ = 0U;
 	GDir* dir = NULL;
 	GError * _inner_error_ = NULL;
-#line 193 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 195 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_debug ("autosave-manager.vala:195: Deleting autosave records");
-#line 197 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = self->priv->update_timeout;
-#line 197 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_tmp0_ > ((guint) 0)) {
 #line 1114 "autosave-manager.c"
 		guint _tmp1_ = 0U;
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp1_ = self->priv->update_timeout;
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_source_remove (_tmp1_);
 #line 1120 "autosave-manager.c"
 	}
-#line 199 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->priv->update_timeout = (guint) 0;
 #line 1124 "autosave-manager.c"
 	{
@@ -1127,26 +1127,26 @@ void autosave_manager_cleanup (AutosaveManager* self) {
 		const gchar* _tmp3_ = NULL;
 		GDir* _tmp4_ = NULL;
 		GDir* _tmp5_ = NULL;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp3_ = autosave_manager_AUTOSAVE_DIR;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp4_ = g_dir_open (_tmp3_, (guint) 0, &_inner_error_);
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = _tmp4_;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1138 "autosave-manager.c"
 			goto __catch32_g_error;
 		}
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp5_ = _tmp2_;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = NULL;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_dir_close0 (dir);
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		dir = _tmp5_;
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_dir_close0 (_tmp2_);
 #line 1151 "autosave-manager.c"
 	}
@@ -1156,38 +1156,38 @@ void autosave_manager_cleanup (AutosaveManager* self) {
 		GError* e = NULL;
 		GError* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp6_ = e;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp7_ = _tmp6_->message;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_warning ("autosave-manager.vala:208: Failed to delete autosaves: %s", _tmp7_);
-#line 209 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
-#line 209 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_dir_close0 (dir);
-#line 209 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
 #line 1175 "autosave-manager.c"
 	}
 	__finally32:
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_dir_close0 (dir);
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.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 202 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_clear_error (&_inner_error_);
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
 #line 1188 "autosave-manager.c"
 	}
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	while (TRUE) {
 #line 1192 "autosave-manager.c"
 		gchar* filename = NULL;
@@ -1200,57 +1200,57 @@ void autosave_manager_cleanup (AutosaveManager* self) {
 		const gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		const gchar* _tmp15_ = NULL;
-#line 214 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp8_ = dir;
-#line 214 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp9_ = g_dir_read_name (_tmp8_);
-#line 214 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp10_ = g_strdup (_tmp9_);
-#line 214 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		filename = _tmp10_;
-#line 215 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp11_ = filename;
-#line 215 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (_tmp11_ == NULL) {
-#line 216 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			_g_free0 (filename);
-#line 216 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			break;
 #line 1219 "autosave-manager.c"
 		}
-#line 217 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp12_ = autosave_manager_AUTOSAVE_DIR;
-#line 217 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp13_ = filename;
-#line 217 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp14_ = g_build_filename (_tmp12_, _tmp13_, NULL);
-#line 217 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		path = _tmp14_;
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp15_ = path;
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_unlink (_tmp15_);
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (path);
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (filename);
 #line 1237 "autosave-manager.c"
 	}
-#line 193 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_dir_close0 (dir);
 #line 1241 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_scan_finished_page_scan_finished (Page* _sender, gpointer self) {
-#line 224 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_on_scan_finished ((AutosaveManager*) self, _sender);
 #line 1248 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_changed_page_crop_changed (Page* _sender, gpointer self) {
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_on_changed ((AutosaveManager*) self);
 #line 1255 "autosave-manager.c"
 }
@@ -1259,17 +1259,17 @@ static void _autosave_manager_on_changed_page_crop_changed (Page* _sender, gpoin
 void autosave_manager_on_page_added (AutosaveManager* self, Page* page) {
 	Page* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 222 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 222 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (page != NULL);
-#line 224 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = page;
-#line 224 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_connect (_tmp0_, "scan-finished", (GCallback) _autosave_manager_on_scan_finished_page_scan_finished, self);
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp1_ = page;
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_connect (_tmp1_, "crop-changed", (GCallback) _autosave_manager_on_changed_page_crop_changed, self);
 #line 1274 "autosave-manager.c"
 }
@@ -1288,51 +1288,51 @@ void autosave_manager_on_page_removed (AutosaveManager* self, Page* page) {
 	const gchar* _tmp8_ = NULL;
 	GHashTable* _tmp10_ = NULL;
 	Page* _tmp11_ = NULL;
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (page != NULL);
-#line 230 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = page;
-#line 230 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_parse_name ("scan-finished", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 230 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _autosave_manager_on_scan_finished_page_scan_finished, self);
-#line 231 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp2_ = page;
-#line 231 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 231 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _autosave_manager_on_changed_page_crop_changed, self);
-#line 233 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp4_ = self->priv->page_filenames;
-#line 233 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp5_ = page;
-#line 233 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp6_ = g_hash_table_lookup (_tmp4_, _tmp5_);
-#line 233 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp7_ = g_strdup ((const gchar*) _tmp6_);
-#line 233 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	filename = _tmp7_;
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp8_ = filename;
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_tmp8_ != NULL) {
 #line 1321 "autosave-manager.c"
 		const gchar* _tmp9_ = NULL;
-#line 235 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp9_ = filename;
-#line 235 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_unlink (_tmp9_);
 #line 1327 "autosave-manager.c"
 	}
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp10_ = self->priv->page_filenames;
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp11_ = page;
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_hash_table_remove (_tmp10_, _tmp11_);
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_free0 (filename);
 #line 1337 "autosave-manager.c"
 }
@@ -1340,24 +1340,24 @@ void autosave_manager_on_page_removed (AutosaveManager* self, Page* page) {
 
 void autosave_manager_on_scan_finished (AutosaveManager* self, Page* page) {
 	Page* _tmp0_ = NULL;
-#line 239 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 239 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (page != NULL);
-#line 241 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = page;
-#line 241 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_save_pixels (self, _tmp0_);
-#line 242 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_save (self, FALSE);
 #line 1353 "autosave-manager.c"
 }
 
 
 void autosave_manager_on_changed (AutosaveManager* self) {
-#line 245 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_save (self, TRUE);
 #line 1362 "autosave-manager.c"
 }
@@ -1365,13 +1365,13 @@ void autosave_manager_on_changed (AutosaveManager* self) {
 
 void autosave_manager_on_cleared (AutosaveManager* self) {
 	GHashTable* _tmp0_ = NULL;
-#line 250 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 252 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = self->priv->page_filenames;
-#line 252 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_hash_table_remove_all (_tmp0_);
-#line 253 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_save (self, TRUE);
 #line 1376 "autosave-manager.c"
 }
@@ -1379,13 +1379,13 @@ void autosave_manager_on_cleared (AutosaveManager* self) {
 
 static gboolean ___lambda4_ (AutosaveManager* self) {
 	gboolean result = FALSE;
-#line 270 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_real_save (self);
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->priv->update_timeout = (guint) 0;
-#line 272 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	result = FALSE;
-#line 272 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return result;
 #line 1390 "autosave-manager.c"
 }
@@ -1394,7 +1394,7 @@ static gboolean ___lambda4_ (AutosaveManager* self) {
 static gboolean ____lambda4__gsource_func (gpointer self) {
 	gboolean result;
 	result = ___lambda4_ ((AutosaveManager*) self);
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return result;
 #line 1399 "autosave-manager.c"
 }
@@ -1405,57 +1405,57 @@ static void autosave_manager_save (AutosaveManager* self, gboolean do_timeout) {
 	guint _tmp1_ = 0U;
 	guint _tmp3_ = 0U;
 	gboolean _tmp5_ = FALSE;
-#line 256 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 258 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp1_ = self->priv->update_timeout;
-#line 258 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_tmp1_ == ((guint) 0)) {
 #line 1414 "autosave-manager.c"
 		gboolean _tmp2_ = FALSE;
-#line 258 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = do_timeout;
-#line 258 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp2_;
 #line 1420 "autosave-manager.c"
 	} else {
-#line 258 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = FALSE;
 #line 1424 "autosave-manager.c"
 	}
-#line 258 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_tmp0_) {
-#line 259 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_debug ("autosave-manager.vala:259: Waiting to autosave...");
 #line 1430 "autosave-manager.c"
 	}
-#line 262 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp3_ = self->priv->update_timeout;
-#line 262 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_tmp3_ > ((guint) 0)) {
 #line 1436 "autosave-manager.c"
 		guint _tmp4_ = 0U;
-#line 263 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp4_ = self->priv->update_timeout;
-#line 263 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_source_remove (_tmp4_);
 #line 1442 "autosave-manager.c"
 	}
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->priv->update_timeout = (guint) 0;
-#line 266 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp5_ = do_timeout;
-#line 266 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_tmp5_) {
 #line 1450 "autosave-manager.c"
 		guint _tmp6_ = 0U;
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda4__gsource_func, autosave_manager_ref (self), autosave_manager_unref);
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		self->priv->update_timeout = _tmp6_;
 #line 1456 "autosave-manager.c"
 	} else {
-#line 276 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_real_save (self);
 #line 1460 "autosave-manager.c"
 	}
@@ -1470,29 +1470,29 @@ static void autosave_manager_real_save (AutosaveManager* self) {
 	GKeyFile* _tmp109_ = NULL;
 	const gchar* _tmp110_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 279 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_debug ("autosave-manager.vala:281: Autosaving book information");
-#line 283 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = g_key_file_new ();
-#line 283 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	file = _tmp0_;
-#line 284 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp1_ = g_strdup ("");
-#line 284 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	page_names = _tmp1_;
 #line 1485 "autosave-manager.c"
 	{
 		gint i = 0;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		i = 0;
 #line 1490 "autosave-manager.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			_tmp2_ = TRUE;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			while (TRUE) {
 #line 1497 "autosave-manager.c"
 				gint _tmp4_ = 0;
@@ -1592,377 +1592,377 @@ static void autosave_manager_real_save (AutosaveManager* self) {
 				Page* _tmp106_ = NULL;
 				gint _tmp107_ = 0;
 				gint _tmp108_ = 0;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				if (!_tmp2_) {
 #line 1597 "autosave-manager.c"
 					gint _tmp3_ = 0;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp3_ = i;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					i = _tmp3_ + 1;
 #line 1603 "autosave-manager.c"
 				}
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp2_ = FALSE;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp4_ = i;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp5_ = autosave_manager_get_book (self);
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp6_ = _tmp5_;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp7_ = book_get_n_pages (_tmp6_);
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp8_ = _tmp7_;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				if (!(((guint) _tmp4_) < _tmp8_)) {
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					break;
 #line 1621 "autosave-manager.c"
 				}
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp9_ = autosave_manager_get_book (self);
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp10_ = _tmp9_;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp11_ = i;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp12_ = book_get_page (_tmp10_, _tmp11_);
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				page = _tmp12_;
-#line 290 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp13_ = page;
-#line 290 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp14_ = page_get_has_data (_tmp13_);
-#line 290 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp15_ = _tmp14_;
-#line 290 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				if (!_tmp15_) {
-#line 291 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_page_unref0 (page);
-#line 291 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					continue;
 #line 1645 "autosave-manager.c"
 				}
-#line 293 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp16_ = i;
-#line 293 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp17_ = g_strdup_printf ("page-%d", _tmp16_);
-#line 293 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				page_name = _tmp17_;
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp18_ = page_names;
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				if (g_strcmp0 (_tmp18_, "") != 0) {
 #line 1657 "autosave-manager.c"
 					const gchar* _tmp19_ = NULL;
 					gchar* _tmp20_ = NULL;
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp19_ = page_names;
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp20_ = g_strconcat (_tmp19_, " ", NULL);
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_g_free0 (page_names);
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					page_names = _tmp20_;
 #line 1668 "autosave-manager.c"
 				}
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp21_ = page_names;
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp22_ = page_name;
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp23_ = g_strconcat (_tmp21_, _tmp22_, NULL);
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (page_names);
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				page_names = _tmp23_;
-#line 298 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp24_ = page_name;
-#line 298 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				g_debug ("autosave-manager.vala:298: Autosaving page %s", _tmp24_);
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp25_ = file;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp26_ = page_name;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp27_ = page;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp28_ = page_get_scan_width (_tmp27_);
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp29_ = _tmp28_;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				g_key_file_set_integer (_tmp25_, _tmp26_, "scan-width", _tmp29_);
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp30_ = file;
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp31_ = page_name;
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp32_ = page;
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp33_ = page_get_scan_height (_tmp32_);
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp34_ = _tmp33_;
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				g_key_file_set_integer (_tmp30_, _tmp31_, "scan-height", _tmp34_);
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp35_ = file;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp36_ = page_name;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp37_ = page;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp38_ = page_get_rowstride (_tmp37_);
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp39_ = _tmp38_;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				g_key_file_set_integer (_tmp35_, _tmp36_, "rowstride", _tmp39_);
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp40_ = file;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp41_ = page_name;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp42_ = page;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp43_ = page_get_n_channels (_tmp42_);
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp44_ = _tmp43_;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				g_key_file_set_integer (_tmp40_, _tmp41_, "n-channels", _tmp44_);
-#line 304 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp45_ = file;
-#line 304 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp46_ = page_name;
-#line 304 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp47_ = page;
-#line 304 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp48_ = page_get_depth (_tmp47_);
-#line 304 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp49_ = _tmp48_;
-#line 304 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				g_key_file_set_integer (_tmp45_, _tmp46_, "depth", _tmp49_);
-#line 305 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp50_ = file;
-#line 305 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp51_ = page_name;
-#line 305 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp52_ = page;
-#line 305 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp53_ = page_get_dpi (_tmp52_);
-#line 305 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp54_ = _tmp53_;
-#line 305 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				g_key_file_set_integer (_tmp50_, _tmp51_, "dpi", _tmp54_);
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp55_ = page;
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp56_ = page_get_scan_direction (_tmp55_);
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp57_ = _tmp56_;
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				switch (_tmp57_) {
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					case SCAN_DIRECTION_TOP_TO_BOTTOM:
 #line 1766 "autosave-manager.c"
 					{
 						GKeyFile* _tmp58_ = NULL;
 						const gchar* _tmp59_ = NULL;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_tmp58_ = file;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_tmp59_ = page_name;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						g_key_file_set_value (_tmp58_, _tmp59_, "scan-direction", "TOP_TO_BOTTOM");
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						break;
 #line 1778 "autosave-manager.c"
 					}
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					case SCAN_DIRECTION_LEFT_TO_RIGHT:
 #line 1782 "autosave-manager.c"
 					{
 						GKeyFile* _tmp60_ = NULL;
 						const gchar* _tmp61_ = NULL;
-#line 312 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_tmp60_ = file;
-#line 312 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_tmp61_ = page_name;
-#line 312 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						g_key_file_set_value (_tmp60_, _tmp61_, "scan-direction", "LEFT_TO_RIGHT");
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						break;
 #line 1794 "autosave-manager.c"
 					}
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					case SCAN_DIRECTION_BOTTOM_TO_TOP:
 #line 1798 "autosave-manager.c"
 					{
 						GKeyFile* _tmp62_ = NULL;
 						const gchar* _tmp63_ = NULL;
-#line 315 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_tmp62_ = file;
-#line 315 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_tmp63_ = page_name;
-#line 315 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						g_key_file_set_value (_tmp62_, _tmp63_, "scan-direction", "BOTTOM_TO_TOP");
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						break;
 #line 1810 "autosave-manager.c"
 					}
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					case SCAN_DIRECTION_RIGHT_TO_LEFT:
 #line 1814 "autosave-manager.c"
 					{
 						GKeyFile* _tmp64_ = NULL;
 						const gchar* _tmp65_ = NULL;
-#line 318 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_tmp64_ = file;
-#line 318 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_tmp65_ = page_name;
-#line 318 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						g_key_file_set_value (_tmp64_, _tmp65_, "scan-direction", "RIGHT_TO_LEFT");
-#line 319 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						break;
 #line 1826 "autosave-manager.c"
 					}
 					default:
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					break;
 #line 1831 "autosave-manager.c"
 				}
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp67_ = page;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp68_ = page_get_color_profile (_tmp67_);
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp69_ = _tmp68_;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp66_ = _tmp69_;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				if (_tmp66_ == NULL) {
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp66_ = "";
 #line 1845 "autosave-manager.c"
 				}
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp70_ = file;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp71_ = page_name;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				g_key_file_set_value (_tmp70_, _tmp71_, "color-profile", _tmp66_);
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp73_ = self->priv->page_filenames;
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp74_ = page;
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp75_ = g_hash_table_lookup (_tmp73_, _tmp74_);
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp72_ = (const gchar*) _tmp75_;
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				if (_tmp72_ == NULL) {
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp72_ = "";
 #line 1865 "autosave-manager.c"
 				}
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp76_ = file;
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp77_ = page_name;
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				g_key_file_set_value (_tmp76_, _tmp77_, "pixels-filename", _tmp72_);
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp78_ = file;
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp79_ = page_name;
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp80_ = page;
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp81_ = page_get_has_crop (_tmp80_);
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp82_ = _tmp81_;
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				g_key_file_set_boolean (_tmp78_, _tmp79_, "has-crop", _tmp82_);
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp84_ = page;
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp85_ = page_get_crop_name (_tmp84_);
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp86_ = _tmp85_;
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp83_ = _tmp86_;
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				if (_tmp83_ == NULL) {
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp83_ = "";
 #line 1897 "autosave-manager.c"
 				}
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp87_ = file;
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp88_ = page_name;
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				g_key_file_set_value (_tmp87_, _tmp88_, "crop-name", _tmp83_);
-#line 325 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp89_ = file;
-#line 325 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp90_ = page_name;
-#line 325 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp91_ = page;
-#line 325 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp92_ = page_get_crop_x (_tmp91_);
-#line 325 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp93_ = _tmp92_;
-#line 325 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				g_key_file_set_integer (_tmp89_, _tmp90_, "crop-x", _tmp93_);
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp94_ = file;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp95_ = page_name;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp96_ = page;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp97_ = page_get_crop_y (_tmp96_);
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp98_ = _tmp97_;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				g_key_file_set_integer (_tmp94_, _tmp95_, "crop-y", _tmp98_);
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp99_ = file;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp100_ = page_name;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp101_ = page;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp102_ = page_get_crop_width (_tmp101_);
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp103_ = _tmp102_;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				g_key_file_set_integer (_tmp99_, _tmp100_, "crop-width", _tmp103_);
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp104_ = file;
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp105_ = page_name;
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp106_ = page;
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp107_ = page_get_crop_height (_tmp106_);
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp108_ = _tmp107_;
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				g_key_file_set_integer (_tmp104_, _tmp105_, "crop-height", _tmp108_);
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (page_name);
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_page_unref0 (page);
 #line 1957 "autosave-manager.c"
 			}
 		}
 	}
-#line 330 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp109_ = file;
-#line 330 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp110_ = page_names;
-#line 330 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_key_file_set_value (_tmp109_, "simple-scan", "pages", _tmp110_);
 #line 1967 "autosave-manager.c"
 	{
@@ -1971,23 +1971,23 @@ static void autosave_manager_real_save (AutosaveManager* self) {
 		GKeyFile* _tmp113_ = NULL;
 		gchar* _tmp114_ = NULL;
 		gchar* _tmp115_ = NULL;
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp111_ = autosave_manager_AUTOSAVE_DIR;
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_mkdir_with_parents (_tmp111_, 0777);
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp112_ = autosave_manager_AUTOSAVE_PATH;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp113_ = file;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp114_ = g_key_file_to_data (_tmp113_, NULL, NULL);
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp115_ = _tmp114_;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_file_set_contents (_tmp112_, _tmp115_, (gssize) (-1), &_inner_error_);
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (_tmp115_);
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1992 "autosave-manager.c"
 			goto __catch33_g_error;
@@ -1999,38 +1999,38 @@ static void autosave_manager_real_save (AutosaveManager* self) {
 		GError* e = NULL;
 		GError* _tmp116_ = NULL;
 		const gchar* _tmp117_ = NULL;
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp116_ = e;
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp117_ = _tmp116_->message;
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_warning ("autosave-manager.vala:339: Failed to write autosave: %s", _tmp117_);
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
 #line 2014 "autosave-manager.c"
 	}
 	__finally33:
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (page_names);
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_key_file_unref0 (file);
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.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 332 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_clear_error (&_inner_error_);
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
 #line 2029 "autosave-manager.c"
 	}
-#line 279 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_free0 (page_names);
-#line 279 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_key_file_unref0 (file);
 #line 2035 "autosave-manager.c"
 }
@@ -2052,54 +2052,54 @@ static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) {
 	GFile* file = NULL;
 	GFile* _tmp10_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (page != NULL);
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = g_direct_hash;
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp1_ = page;
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp2_ = _tmp0_ (_tmp1_);
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp3_ = g_strdup_printf ("%u.pixels", _tmp2_);
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	filename = _tmp3_;
-#line 346 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp4_ = autosave_manager_AUTOSAVE_DIR;
-#line 346 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp5_ = g_build_filename (_tmp4_, filename, NULL);
-#line 346 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	path = _tmp5_;
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp6_ = self->priv->page_filenames;
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp7_ = page;
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp8_ = _page_ref0 (_tmp7_);
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp9_ = g_strdup (filename);
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_hash_table_insert (_tmp6_, _tmp8_, _tmp9_);
-#line 349 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_debug ("autosave-manager.vala:349: Autosaving page pixels to %s", path);
-#line 351 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp10_ = g_file_new_for_path (path);
-#line 351 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	file = _tmp10_;
 #line 2091 "autosave-manager.c"
 	{
 		Page* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
 		guchar* _tmp13_ = NULL;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp11_ = page;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp13_ = page_get_pixels (_tmp11_, &_tmp12_);
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_file_replace_contents (file, _tmp13_, (gsize) _tmp12_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL, &_inner_error_);
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2104 "autosave-manager.c"
 			goto __catch34_g_error;
@@ -2111,42 +2111,42 @@ static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) {
 		GError* e = NULL;
 		GError* _tmp14_ = NULL;
 		const gchar* _tmp15_ = NULL;
-#line 352 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 352 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp14_ = e;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp15_ = _tmp14_->message;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_warning ("autosave-manager.vala:358: Failed to autosave page contents: %s", _tmp15_);
-#line 352 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
 #line 2126 "autosave-manager.c"
 	}
 	__finally34:
-#line 352 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 352 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_object_unref0 (file);
-#line 352 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (path);
-#line 352 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (filename);
-#line 352 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.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 352 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_clear_error (&_inner_error_);
-#line 352 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
 #line 2143 "autosave-manager.c"
 	}
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_object_unref0 (file);
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_free0 (path);
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_free0 (filename);
 #line 2151 "autosave-manager.c"
 }
@@ -2155,48 +2155,48 @@ static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) {
 Book* autosave_manager_get_book (AutosaveManager* self) {
 	Book* result;
 	Book* _tmp0_ = NULL;
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 28 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 28 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = self->priv->book_;
-#line 28 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 28 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	result = _tmp0_;
-#line 28 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 28 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return result;
 #line 2166 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_page_added_book_page_added (Book* _sender, Page* page, gpointer self) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_on_page_added ((AutosaveManager*) self, page);
 #line 2173 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_page_removed_book_page_removed (Book* _sender, Page* page, gpointer self) {
-#line 40 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_on_page_removed ((AutosaveManager*) self, page);
 #line 2180 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_changed_book_reordered (Book* _sender, gpointer self) {
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_on_changed ((AutosaveManager*) self);
 #line 2187 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_cleared_book_cleared (Book* _sender, gpointer self) {
-#line 42 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_on_cleared ((AutosaveManager*) self);
 #line 2194 "autosave-manager.c"
 }
 
 
 static gpointer _book_ref0 (gpointer self) {
-#line 44 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return self ? book_ref (self) : NULL;
 #line 2201 "autosave-manager.c"
 }
@@ -2210,11 +2210,11 @@ void autosave_manager_set_book (AutosaveManager* self, Book* value) {
 	Book* _tmp22_ = NULL;
 	Book* _tmp23_ = NULL;
 	Book* _tmp24_ = NULL;
-#line 30 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 30 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 32 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = self->priv->book_;
-#line 32 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_tmp0_ != NULL) {
 #line 2219 "autosave-manager.c"
 		Book* _tmp11_ = NULL;
@@ -2227,14 +2227,14 @@ void autosave_manager_set_book (AutosaveManager* self, Book* value) {
 		guint _tmp18_ = 0U;
 		{
 			gint i = 0;
-#line 34 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			i = 0;
 #line 2232 "autosave-manager.c"
 			{
 				gboolean _tmp1_ = FALSE;
-#line 34 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp1_ = TRUE;
-#line 34 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				while (TRUE) {
 #line 2239 "autosave-manager.c"
 					gint _tmp3_ = 0;
@@ -2246,111 +2246,111 @@ void autosave_manager_set_book (AutosaveManager* self, Book* value) {
 					gint _tmp8_ = 0;
 					Page* _tmp9_ = NULL;
 					Page* _tmp10_ = NULL;
-#line 34 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					if (!_tmp1_) {
 #line 2251 "autosave-manager.c"
 						gint _tmp2_ = 0;
-#line 34 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_tmp2_ = i;
-#line 34 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						i = _tmp2_ + 1;
 #line 2257 "autosave-manager.c"
 					}
-#line 34 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp1_ = FALSE;
-#line 34 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp3_ = i;
-#line 34 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp4_ = self->priv->book_;
-#line 34 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp5_ = book_get_n_pages (_tmp4_);
-#line 34 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp6_ = _tmp5_;
-#line 34 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					if (!(((guint) _tmp3_) < _tmp6_)) {
-#line 34 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						break;
 #line 2273 "autosave-manager.c"
 					}
-#line 36 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp7_ = self->priv->book_;
-#line 36 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp8_ = i;
-#line 36 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp9_ = book_get_page (_tmp7_, _tmp8_);
-#line 36 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					page = _tmp9_;
-#line 37 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 37 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp10_ = page;
-#line 37 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 37 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					autosave_manager_on_page_removed (self, _tmp10_);
-#line 34 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_page_unref0 (page);
 #line 2289 "autosave-manager.c"
 				}
 			}
 		}
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp11_ = self->priv->book_;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp12_, NULL, FALSE);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _autosave_manager_on_page_added_book_page_added, self);
-#line 40 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp13_ = self->priv->book_;
-#line 40 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp14_, NULL, FALSE);
-#line 40 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _autosave_manager_on_page_removed_book_page_removed, self);
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp15_ = self->priv->book_;
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_signal_parse_name ("reordered", TYPE_BOOK, &_tmp16_, NULL, FALSE);
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _autosave_manager_on_changed_book_reordered, self);
-#line 42 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp17_ = self->priv->book_;
-#line 42 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_signal_parse_name ("cleared", TYPE_BOOK, &_tmp18_, NULL, FALSE);
-#line 42 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _autosave_manager_on_cleared_book_cleared, self);
 #line 2317 "autosave-manager.c"
 	}
-#line 44 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp19_ = value;
-#line 44 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp20_ = _book_ref0 (_tmp19_);
-#line 44 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_book_unref0 (self->priv->book_);
-#line 44 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->priv->book_ = _tmp20_;
-#line 45 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp21_ = self->priv->book_;
-#line 45 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_connect (_tmp21_, "page-added", (GCallback) _autosave_manager_on_page_added_book_page_added, self);
-#line 46 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 46 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp22_ = self->priv->book_;
-#line 46 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 46 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_connect (_tmp22_, "page-removed", (GCallback) _autosave_manager_on_page_removed_book_page_removed, self);
-#line 47 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp23_ = self->priv->book_;
-#line 47 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_connect (_tmp23_, "reordered", (GCallback) _autosave_manager_on_changed_book_reordered, self);
-#line 48 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp24_ = self->priv->book_;
-#line 48 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_connect (_tmp24_, "cleared", (GCallback) _autosave_manager_on_cleared_book_cleared, self);
 #line 2343 "autosave-manager.c"
 	{
 		gint i = 0;
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		i = 0;
 #line 2348 "autosave-manager.c"
 		{
 			gboolean _tmp25_ = FALSE;
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			_tmp25_ = TRUE;
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			while (TRUE) {
 #line 2355 "autosave-manager.c"
 				gint _tmp27_ = 0;
@@ -2362,45 +2362,45 @@ void autosave_manager_set_book (AutosaveManager* self, Book* value) {
 				gint _tmp32_ = 0;
 				Page* _tmp33_ = NULL;
 				Page* _tmp34_ = NULL;
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				if (!_tmp25_) {
 #line 2367 "autosave-manager.c"
 					gint _tmp26_ = 0;
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp26_ = i;
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					i = _tmp26_ + 1;
 #line 2373 "autosave-manager.c"
 				}
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp25_ = FALSE;
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp27_ = i;
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp28_ = self->priv->book_;
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp29_ = book_get_n_pages (_tmp28_);
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp30_ = _tmp29_;
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				if (!(((guint) _tmp27_) < _tmp30_)) {
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					break;
 #line 2389 "autosave-manager.c"
 				}
-#line 51 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp31_ = self->priv->book_;
-#line 51 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp32_ = i;
-#line 51 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp33_ = book_get_page (_tmp31_, _tmp32_);
-#line 51 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				page = _tmp33_;
-#line 52 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 52 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp34_ = page;
-#line 52 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 52 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				autosave_manager_on_page_added (self, _tmp34_);
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_page_unref0 (page);
 #line 2405 "autosave-manager.c"
 			}
@@ -2410,16 +2410,16 @@ void autosave_manager_set_book (AutosaveManager* self, Book* value) {
 
 
 static void value_autosave_manager_init (GValue* value) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	value->data[0].v_pointer = NULL;
 #line 2415 "autosave-manager.c"
 }
 
 
 static void value_autosave_manager_free_value (GValue* value) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (value->data[0].v_pointer) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_unref (value->data[0].v_pointer);
 #line 2424 "autosave-manager.c"
 	}
@@ -2427,13 +2427,13 @@ static void value_autosave_manager_free_value (GValue* value) {
 
 
 static void value_autosave_manager_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (src_value->data[0].v_pointer) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		dest_value->data[0].v_pointer = autosave_manager_ref (src_value->data[0].v_pointer);
 #line 2434 "autosave-manager.c"
 	} else {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 2438 "autosave-manager.c"
 	}
@@ -2441,37 +2441,37 @@ static void value_autosave_manager_copy_value (const GValue* src_value, GValue*
 
 
 static gpointer value_autosave_manager_peek_pointer (const GValue* value) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return value->data[0].v_pointer;
 #line 2446 "autosave-manager.c"
 }
 
 
 static gchar* value_autosave_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (collect_values[0].v_pointer) {
 #line 2453 "autosave-manager.c"
 		AutosaveManager* object;
 		object = collect_values[0].v_pointer;
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 2460 "autosave-manager.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.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 2464 "autosave-manager.c"
 		}
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = autosave_manager_ref (object);
 #line 2468 "autosave-manager.c"
 	} else {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = NULL;
 #line 2472 "autosave-manager.c"
 	}
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return NULL;
 #line 2476 "autosave-manager.c"
 }
@@ -2480,27 +2480,27 @@ static gchar* value_autosave_manager_collect_value (GValue* value, guint n_colle
 static gchar* value_autosave_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	AutosaveManager** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (!object_p) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 2487 "autosave-manager.c"
 	}
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (!value->data[0].v_pointer) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		*object_p = NULL;
 #line 2493 "autosave-manager.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		*object_p = value->data[0].v_pointer;
 #line 2497 "autosave-manager.c"
 	} else {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		*object_p = autosave_manager_ref (value->data[0].v_pointer);
 #line 2501 "autosave-manager.c"
 	}
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return NULL;
 #line 2505 "autosave-manager.c"
 }
@@ -2508,22 +2508,22 @@ static gchar* value_autosave_manager_lcopy_value (const GValue* value, guint n_c
 
 GParamSpec* param_spec_autosave_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecAutosaveManager* spec;
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_AUTOSAVE_MANAGER), NULL);
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return G_PARAM_SPEC (spec);
 #line 2519 "autosave-manager.c"
 }
 
 
 gpointer value_get_autosave_manager (const GValue* value) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AUTOSAVE_MANAGER), NULL);
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return value->data[0].v_pointer;
 #line 2528 "autosave-manager.c"
 }
@@ -2531,29 +2531,29 @@ gpointer value_get_autosave_manager (const GValue* value) {
 
 void value_set_autosave_manager (GValue* value, gpointer v_object) {
 	AutosaveManager* old;
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AUTOSAVE_MANAGER));
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	old = value->data[0].v_pointer;
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (v_object) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_AUTOSAVE_MANAGER));
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = v_object;
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_ref (value->data[0].v_pointer);
 #line 2548 "autosave-manager.c"
 	} else {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = NULL;
 #line 2552 "autosave-manager.c"
 	}
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (old) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_unref (old);
 #line 2558 "autosave-manager.c"
 	}
@@ -2562,27 +2562,27 @@ void value_set_autosave_manager (GValue* value, gpointer v_object) {
 
 void value_take_autosave_manager (GValue* value, gpointer v_object) {
 	AutosaveManager* old;
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AUTOSAVE_MANAGER));
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	old = value->data[0].v_pointer;
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (v_object) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_AUTOSAVE_MANAGER));
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = v_object;
 #line 2577 "autosave-manager.c"
 	} else {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = NULL;
 #line 2581 "autosave-manager.c"
 	}
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (old) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_unref (old);
 #line 2587 "autosave-manager.c"
 	}
@@ -2596,42 +2596,42 @@ static void autosave_manager_class_init (AutosaveManagerClass * klass) {
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_parent_class = g_type_class_peek_parent (klass);
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	((AutosaveManagerClass *) klass)->finalize = autosave_manager_finalize;
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_type_class_add_private (klass, sizeof (AutosaveManagerPrivate));
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = g_get_user_cache_dir ();
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp1_ = g_build_filename (_tmp0_, "simple-scan", "autosaves", NULL);
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_AUTOSAVE_DIR = _tmp1_;
-#line 16 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 16 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp2_ = g_strdup ("autosave.book");
-#line 16 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 16 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_AUTOSAVE_FILENAME = _tmp2_;
-#line 17 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp3_ = autosave_manager_AUTOSAVE_DIR;
-#line 17 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp4_ = autosave_manager_AUTOSAVE_FILENAME;
-#line 17 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp5_ = g_build_filename (_tmp3_, _tmp4_, NULL);
-#line 17 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_AUTOSAVE_PATH = _tmp5_;
 #line 2623 "autosave-manager.c"
 }
 
 
 static void autosave_manager_instance_init (AutosaveManager * self) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->priv = AUTOSAVE_MANAGER_GET_PRIVATE (self);
-#line 19 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->priv->update_timeout = (guint) 0;
-#line 23 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 23 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->priv->book_ = NULL;
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->ref_count = 1;
 #line 2636 "autosave-manager.c"
 }
@@ -2639,13 +2639,13 @@ static void autosave_manager_instance_init (AutosaveManager * self) {
 
 static void autosave_manager_finalize (AutosaveManager* obj) {
 	AutosaveManager * self;
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_AUTOSAVE_MANAGER, AutosaveManager);
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_handlers_destroy (self);
-#line 21 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 21 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_hash_table_unref0 (self->priv->page_filenames);
-#line 23 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 23 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_book_unref0 (self->priv->book_);
 #line 2650 "autosave-manager.c"
 }
@@ -2668,9 +2668,9 @@ GType autosave_manager_get_type (void) {
 gpointer autosave_manager_ref (gpointer instance) {
 	AutosaveManager* self;
 	self = instance;
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return instance;
 #line 2675 "autosave-manager.c"
 }
@@ -2679,11 +2679,11 @@ gpointer autosave_manager_ref (gpointer instance) {
 void autosave_manager_unref (gpointer instance) {
 	AutosaveManager* self;
 	self = instance;
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		AUTOSAVE_MANAGER_GET_CLASS (self)->finalize (self);
-#line 13 "/home/bob/bzr/simple-scan/3.16/src/autosave-manager.vala"
+#line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 2688 "autosave-manager.c"
 	}
diff --git a/src/book-view.c b/src/book-view.c
index 2c652ce..7c44f03 100644
--- a/src/book-view.c
+++ b/src/book-view.c
@@ -204,28 +204,28 @@ static void _vala_book_view_set_property (GObject * object, guint property_id, c
 
 
 static void _book_view_add_cb_book_page_added (Book* _sender, Page* page, gpointer self) {
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_add_cb ((BookView*) self, _sender, page);
 #line 210 "book-view.c"
 }
 
 
 static void _book_view_remove_cb_book_page_removed (Book* _sender, Page* page, gpointer self) {
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_remove_cb ((BookView*) self, _sender, page);
 #line 217 "book-view.c"
 }
 
 
 static void _book_view_reorder_cb_book_reordered (Book* _sender, gpointer self) {
-#line 125 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_reorder_cb ((BookView*) self, _sender);
 #line 224 "book-view.c"
 }
 
 
 static void _book_view_clear_cb_book_cleared (Book* _sender, gpointer self) {
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_clear_cb ((BookView*) self, _sender);
 #line 231 "book-view.c"
 }
@@ -234,7 +234,7 @@ static void _book_view_clear_cb_book_cleared (Book* _sender, gpointer self) {
 static gboolean _book_view_configure_cb_gtk_widget_configure_event (GtkWidget* _sender, GdkEventConfigure* event, gpointer self) {
 	gboolean result;
 	result = book_view_configure_cb ((BookView*) self, _sender, event);
-#line 127 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 240 "book-view.c"
 }
@@ -243,7 +243,7 @@ static gboolean _book_view_configure_cb_gtk_widget_configure_event (GtkWidget* _
 static gboolean _book_view_draw_cb_gtk_widget_draw (GtkWidget* _sender, cairo_t* cr, gpointer self) {
 	gboolean result;
 	result = book_view_draw_cb ((BookView*) self, _sender, cr);
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 249 "book-view.c"
 }
@@ -252,7 +252,7 @@ static gboolean _book_view_draw_cb_gtk_widget_draw (GtkWidget* _sender, cairo_t*
 static gboolean _book_view_motion_cb_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self) {
 	gboolean result;
 	result = book_view_motion_cb ((BookView*) self, _sender, event);
-#line 129 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 258 "book-view.c"
 }
@@ -261,7 +261,7 @@ static gboolean _book_view_motion_cb_gtk_widget_motion_notify_event (GtkWidget*
 static gboolean _book_view_key_cb_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
 	result = book_view_key_cb ((BookView*) self, _sender, event);
-#line 130 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 267 "book-view.c"
 }
@@ -270,7 +270,7 @@ static gboolean _book_view_key_cb_gtk_widget_key_press_event (GtkWidget* _sender
 static gboolean _book_view_button_cb_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = book_view_button_cb ((BookView*) self, _sender, event);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 276 "book-view.c"
 }
@@ -279,7 +279,7 @@ static gboolean _book_view_button_cb_gtk_widget_button_press_event (GtkWidget* _
 static gboolean _book_view_button_cb_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = book_view_button_cb ((BookView*) self, _sender, event);
-#line 132 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 285 "book-view.c"
 }
@@ -288,7 +288,7 @@ static gboolean _book_view_button_cb_gtk_widget_button_release_event (GtkWidget*
 static gboolean _book_view_focus_cb_gtk_widget_focus_in_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = book_view_focus_cb ((BookView*) self, _sender, event);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 294 "book-view.c"
 }
@@ -297,35 +297,35 @@ static gboolean _book_view_focus_cb_gtk_widget_focus_in_event (GtkWidget* _sende
 static gboolean _book_view_focus_cb_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = book_view_focus_cb ((BookView*) self, _sender, event);
-#line 134 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 303 "book-view.c"
 }
 
 
 static void _book_view_scroll_cb_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 135 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_scroll_cb ((BookView*) self, _sender);
 #line 310 "book-view.c"
 }
 
 
 static void _page_unref0_ (gpointer var) {
-#line 95 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	(var == NULL) ? NULL : (var = (page_unref (var), NULL));
 #line 317 "book-view.c"
 }
 
 
 static void _page_view_unref0_ (gpointer var) {
-#line 95 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	(var == NULL) ? NULL : (var = (page_view_unref (var), NULL));
 #line 324 "book-view.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self ? g_object_ref (self) : NULL;
 #line 331 "book-view.c"
 }
@@ -365,25 +365,25 @@ BookView* book_view_construct (GType object_type, Book* book) {
 	GtkWidget* _tmp40_ = NULL;
 	GtkAdjustment* _tmp41_ = NULL;
 	GtkWidget* _tmp42_ = NULL;
-#line 74 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (book != NULL, NULL);
-#line 76 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self = (BookView*) g_object_new (object_type, "orientation", GTK_ORIENTATION_VERTICAL, NULL);
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = book;
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_set_book (self, _tmp0_);
 #line 377 "book-view.c"
 	{
 		gint i = 0;
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
 #line 382 "book-view.c"
 		{
 			gboolean _tmp1_ = FALSE;
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp1_ = TRUE;
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
 #line 389 "book-view.c"
 				gint _tmp3_ = 0;
@@ -396,195 +396,195 @@ BookView* book_view_construct (GType object_type, Book* book) {
 				Page* _tmp9_ = NULL;
 				Book* _tmp10_ = NULL;
 				Page* _tmp11_ = NULL;
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp1_) {
 #line 402 "book-view.c"
 					gint _tmp2_ = 0;
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp2_ = i;
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp2_ + 1;
 #line 408 "book-view.c"
 				}
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp1_ = FALSE;
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp3_ = i;
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp4_ = book;
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp5_ = book_get_n_pages (_tmp4_);
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp6_ = _tmp5_;
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!(((guint) _tmp3_) < _tmp6_)) {
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
 #line 424 "book-view.c"
 				}
-#line 82 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp7_ = book;
-#line 82 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp8_ = i;
-#line 82 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp9_ = book_get_page (_tmp7_, _tmp8_);
-#line 82 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page = _tmp9_;
-#line 83 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp10_ = book;
-#line 83 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp11_ = page;
-#line 83 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				book_view_add_cb (self, _tmp10_, _tmp11_);
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (page);
 #line 442 "book-view.c"
 			}
 		}
 	}
-#line 86 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp12_ = book;
-#line 86 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp13_ = book_get_page (_tmp12_, 0);
-#line 86 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp14_ = _tmp13_;
-#line 86 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_set_selected_page (self, _tmp14_);
-#line 86 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_unref0 (_tmp14_);
-#line 89 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp15_ = book;
-#line 89 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp15_, "page-added", (GCallback) _book_view_add_cb_book_page_added, self, 0);
-#line 90 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp16_ = book;
-#line 90 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp16_, "page-removed", (GCallback) _book_view_remove_cb_book_page_removed, self, 0);
-#line 91 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp17_ = book;
-#line 91 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp17_, "reordered", (GCallback) _book_view_reorder_cb_book_reordered, self, 0);
-#line 92 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp18_ = book;
-#line 92 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp18_, "cleared", (GCallback) _book_view_clear_cb_book_cleared, self, 0);
-#line 94 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
-#line 95 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp19_ = g_direct_hash;
-#line 95 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp20_ = g_direct_equal;
-#line 95 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp21_ = g_hash_table_new_full (_tmp19_, _tmp20_, _page_unref0_, _page_view_unref0_);
-#line 95 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_hash_table_unref0 (self->priv->page_data);
-#line 95 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->page_data = _tmp21_;
-#line 96 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->cursor = GDK_ARROW;
-#line 98 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp22_ = (GtkDrawingArea*) gtk_drawing_area_new ();
-#line 98 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_ref_sink (_tmp22_);
-#line 98 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->drawing_area);
-#line 98 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->drawing_area = (GtkWidget*) _tmp22_;
-#line 99 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp23_ = self->priv->drawing_area;
-#line 99 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_set_size_request (_tmp23_, 200, 100);
-#line 100 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp24_ = self->priv->drawing_area;
-#line 100 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_set (_tmp24_, "can-focus", TRUE, NULL);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp25_ = self->priv->drawing_area;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_set_events (_tmp25_, ((((GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK) | GDK_BUTTON_RELEASE_MASK) | GDK_FOCUS_CHANGE_MASK) | GDK_STRUCTURE_MASK) | GDK_SCROLL_MASK);
-#line 102 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp26_ = self->priv->drawing_area;
-#line 102 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_box_pack_start ((GtkBox*) self, _tmp26_, TRUE, TRUE, (guint) 0);
-#line 104 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp27_ = (GtkScrollbar*) gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, NULL);
-#line 104 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_ref_sink (_tmp27_);
-#line 104 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->scroll);
-#line 104 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->scroll = _tmp27_;
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp28_ = self->priv->scroll;
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp29_ = gtk_range_get_adjustment ((GtkRange*) _tmp28_);
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp30_ = _tmp29_;
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp31_ = _g_object_ref0 (_tmp30_);
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->adjustment);
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->adjustment = _tmp31_;
-#line 106 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp32_ = self->priv->scroll;
-#line 106 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_box_pack_start ((GtkBox*) self, (GtkWidget*) _tmp32_, FALSE, TRUE, (guint) 0);
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp33_ = self->priv->drawing_area;
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp33_, "configure-event", (GCallback) _book_view_configure_cb_gtk_widget_configure_event, self, 0);
-#line 109 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp34_ = self->priv->drawing_area;
-#line 109 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp34_, "draw", (GCallback) _book_view_draw_cb_gtk_widget_draw, self, 0);
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp35_ = self->priv->drawing_area;
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp35_, "motion-notify-event", (GCallback) _book_view_motion_cb_gtk_widget_motion_notify_event, self, 0);
-#line 111 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp36_ = self->priv->drawing_area;
-#line 111 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp36_, "key-press-event", (GCallback) _book_view_key_cb_gtk_widget_key_press_event, self, 0);
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp37_ = self->priv->drawing_area;
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp37_, "button-press-event", (GCallback) _book_view_button_cb_gtk_widget_button_press_event, self, 0);
-#line 113 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp38_ = self->priv->drawing_area;
-#line 113 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp38_, "button-release-event", (GCallback) _book_view_button_cb_gtk_widget_button_release_event, self, 0);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp39_ = self->priv->drawing_area;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp39_, "focus-in-event", (GCallback) _book_view_focus_cb_gtk_widget_focus_in_event, self, G_CONNECT_AFTER);
-#line 115 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp40_ = self->priv->drawing_area;
-#line 115 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp40_, "focus-out-event", (GCallback) _book_view_focus_cb_gtk_widget_focus_out_event, self, G_CONNECT_AFTER);
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp41_ = self->priv->adjustment;
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (_tmp41_, "value-changed", (GCallback) _book_view_scroll_cb_gtk_adjustment_value_changed, self, 0);
-#line 118 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp42_ = self->priv->drawing_area;
-#line 118 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_set_visible (_tmp42_, TRUE);
-#line 74 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self;
 #line 576 "book-view.c"
 }
 
 
 BookView* book_view_new (Book* book) {
-#line 74 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return book_view_construct (TYPE_BOOK_VIEW, book);
 #line 583 "book-view.c"
 }
 
 
 static gpointer _page_view_ref0 (gpointer self) {
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self ? page_view_ref (self) : NULL;
 #line 590 "book-view.c"
 }
@@ -599,27 +599,27 @@ static PageView* book_view_get_nth_page (BookView* self, gint n) {
 	GHashTable* _tmp3_ = NULL;
 	gconstpointer _tmp4_ = NULL;
 	PageView* _tmp5_ = NULL;
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 140 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->_book;
-#line 140 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = n;
-#line 140 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = book_get_page (_tmp0_, _tmp1_);
-#line 140 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	page = _tmp2_;
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = self->priv->page_data;
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = g_hash_table_lookup (_tmp3_, page);
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = _page_view_ref0 ((PageView*) _tmp4_);
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = _tmp5_;
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_unref0 (page);
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 625 "book-view.c"
 }
@@ -629,21 +629,21 @@ static PageView* book_view_get_next_page (BookView* self, PageView* page) {
 	PageView* result = NULL;
 	PageView* _tmp18_ = NULL;
 	PageView* _tmp19_ = NULL;
-#line 144 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 144 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (page != NULL, NULL);
 #line 637 "book-view.c"
 	{
 		gint i = 0;
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
 #line 642 "book-view.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp0_ = TRUE;
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
 #line 649 "book-view.c"
 				Page* p = NULL;
@@ -655,100 +655,100 @@ static PageView* book_view_get_next_page (BookView* self, PageView* page) {
 				PageView* _tmp7_ = NULL;
 				Page* _tmp8_ = NULL;
 				Page* _tmp9_ = NULL;
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp0_) {
 #line 661 "book-view.c"
 					gint _tmp1_ = 0;
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp1_ = i;
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp1_ + 1;
 #line 667 "book-view.c"
 				}
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp0_ = FALSE;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp2_ = self->priv->_book;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp3_ = i;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp4_ = book_get_page (_tmp2_, _tmp3_);
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				p = _tmp4_;
-#line 149 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 149 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp5_ = p;
-#line 149 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 149 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp5_ == NULL) {
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_unref0 (p);
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
 #line 687 "book-view.c"
 				}
-#line 151 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp6_ = p;
-#line 151 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp7_ = page;
-#line 151 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp8_ = page_view_get_page (_tmp7_);
-#line 151 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp9_ = _tmp8_;
-#line 151 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp6_ == _tmp9_) {
 #line 699 "book-view.c"
 					Book* _tmp10_ = NULL;
 					gint _tmp11_ = 0;
 					Page* _tmp12_ = NULL;
 					Page* _tmp13_ = NULL;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp10_ = self->priv->_book;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp11_ = i;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp12_ = book_get_page (_tmp10_, _tmp11_ + 1);
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_unref0 (p);
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					p = _tmp12_;
-#line 154 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp13_ = p;
-#line 154 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					if (_tmp13_ != NULL) {
 #line 718 "book-view.c"
 						GHashTable* _tmp14_ = NULL;
 						Page* _tmp15_ = NULL;
 						gconstpointer _tmp16_ = NULL;
 						PageView* _tmp17_ = NULL;
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						_tmp14_ = self->priv->page_data;
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						_tmp15_ = p;
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						_tmp16_ = g_hash_table_lookup (_tmp14_, _tmp15_);
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						_tmp17_ = _page_view_ref0 ((PageView*) _tmp16_);
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						result = _tmp17_;
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						_page_unref0 (p);
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						return result;
 #line 737 "book-view.c"
 					}
 				}
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (p);
 #line 742 "book-view.c"
 			}
 		}
 	}
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp18_ = page;
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp19_ = _page_view_ref0 (_tmp18_);
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = _tmp19_;
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 754 "book-view.c"
 }
@@ -761,27 +761,27 @@ static PageView* book_view_get_prev_page (BookView* self, PageView* page) {
 	PageView* _tmp1_ = NULL;
 	PageView* _tmp16_ = NULL;
 	PageView* _tmp17_ = NULL;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (page != NULL, NULL);
-#line 164 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = page;
-#line 164 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = _page_view_ref0 (_tmp0_);
-#line 164 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 164 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	prev_page = _tmp1_;
 #line 775 "book-view.c"
 	{
 		gint i = 0;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
 #line 780 "book-view.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp2_ = TRUE;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
 #line 787 "book-view.c"
 				Page* p = NULL;
@@ -797,126 +797,126 @@ static PageView* book_view_get_prev_page (BookView* self, PageView* page) {
 				Page* _tmp13_ = NULL;
 				gconstpointer _tmp14_ = NULL;
 				PageView* _tmp15_ = NULL;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp2_) {
 #line 803 "book-view.c"
 					gint _tmp3_ = 0;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp3_ = i;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp3_ + 1;
 #line 809 "book-view.c"
 				}
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp2_ = FALSE;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp4_ = self->priv->_book;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp5_ = i;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp6_ = book_get_page (_tmp4_, _tmp5_);
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				p = _tmp6_;
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp7_ = p;
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp7_ == NULL) {
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_unref0 (p);
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
 #line 829 "book-view.c"
 				}
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp8_ = p;
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp9_ = page;
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp10_ = page_view_get_page (_tmp9_);
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp11_ = _tmp10_;
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp8_ == _tmp11_) {
-#line 171 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					result = prev_page;
-#line 171 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_unref0 (p);
-#line 171 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					return result;
 #line 847 "book-view.c"
 				}
-#line 172 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp12_ = self->priv->page_data;
-#line 172 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp13_ = p;
-#line 172 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp14_ = g_hash_table_lookup (_tmp12_, _tmp13_);
-#line 172 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp15_ = _page_view_ref0 ((PageView*) _tmp14_);
-#line 172 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (prev_page);
-#line 172 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				prev_page = _tmp15_;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (p);
 #line 863 "book-view.c"
 			}
 		}
 	}
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp16_ = page;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp17_ = _page_view_ref0 (_tmp16_);
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = _tmp17_;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (prev_page);
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 877 "book-view.c"
 }
 
 
 static void book_view_page_view_changed_cb (BookView* self, PageView* page) {
-#line 178 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 178 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (page != NULL);
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
 #line 888 "book-view.c"
 }
 
 
 static void book_view_page_view_size_changed_cb (BookView* self, PageView* page) {
-#line 183 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 183 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (page != NULL);
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
-#line 186 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
 #line 901 "book-view.c"
 }
 
 
 static void _book_view_page_view_changed_cb_page_view_changed (PageView* _sender, gpointer self) {
-#line 192 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_page_view_changed_cb ((BookView*) self, _sender);
 #line 908 "book-view.c"
 }
 
 
 static void _book_view_page_view_size_changed_cb_page_view_size_changed (PageView* _sender, gpointer self) {
-#line 193 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_page_view_size_changed_cb ((BookView*) self, _sender);
 #line 915 "book-view.c"
 }
 
 
 static gpointer _page_ref0 (gpointer self) {
-#line 194 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self ? page_ref (self) : NULL;
 #line 922 "book-view.c"
 }
@@ -930,37 +930,37 @@ static void book_view_add_cb (BookView* self, Book* book, Page* page) {
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	PageView* _tmp5_ = NULL;
-#line 189 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 189 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (book != NULL);
-#line 189 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (page != NULL);
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = page;
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = page_view_new (_tmp0_);
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	page_view = _tmp1_;
-#line 192 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (page_view, "changed", (GCallback) _book_view_page_view_changed_cb_page_view_changed, self, 0);
-#line 193 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_connect_object (page_view, "size-changed", (GCallback) _book_view_page_view_size_changed_cb_page_view_size_changed, self, 0);
-#line 194 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = self->priv->page_data;
-#line 194 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = page;
-#line 194 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = _page_ref0 (_tmp3_);
-#line 194 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = _page_view_ref0 (page_view);
-#line 194 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_hash_table_insert (_tmp2_, _tmp4_, _tmp5_);
-#line 195 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
-#line 189 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (page_view);
 #line 966 "book-view.c"
 }
@@ -975,73 +975,73 @@ static void book_view_set_selected_page_view (BookView* self, PageView* page) {
 	GtkWidget* _tmp8_ = NULL;
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp10_ = FALSE;
-#line 199 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = self->priv->selected_page_view;
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp1_ != NULL) {
 #line 985 "book-view.c"
 		PageView* _tmp2_ = NULL;
 		PageView* _tmp3_ = NULL;
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp2_ = page;
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp3_ = self->priv->selected_page_view;
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = _tmp2_ != _tmp3_;
 #line 994 "book-view.c"
 	} else {
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = FALSE;
 #line 998 "book-view.c"
 	}
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp0_) {
 #line 1002 "book-view.c"
 		PageView* _tmp4_ = NULL;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp4_ = self->priv->selected_page_view;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		page_view_set_selected (_tmp4_, TRUE);
 #line 1008 "book-view.c"
 	}
-#line 205 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = page;
-#line 205 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp6_ = _page_view_ref0 (_tmp5_);
-#line 205 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (self->priv->selected_page_view);
-#line 205 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->selected_page_view = _tmp6_;
-#line 206 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp7_ = self->priv->selected_page_view;
-#line 206 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp7_ == NULL) {
-#line 207 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 207 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
 #line 1024 "book-view.c"
 	}
-#line 210 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp8_ = self->priv->drawing_area;
-#line 210 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_get (_tmp8_, "has-focus", &_tmp9_, NULL);
-#line 210 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp10_ = _tmp9_;
-#line 210 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (!_tmp10_) {
 #line 1034 "book-view.c"
 		PageView* _tmp11_ = NULL;
-#line 211 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp11_ = self->priv->selected_page_view;
-#line 211 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		page_view_set_selected (_tmp11_, FALSE);
 #line 1040 "book-view.c"
 	} else {
 		PageView* _tmp12_ = NULL;
-#line 213 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp12_ = self->priv->selected_page_view;
-#line 213 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		page_view_set_selected (_tmp12_, TRUE);
 #line 1047 "book-view.c"
 	}
@@ -1068,73 +1068,73 @@ static void book_view_show_page_view (BookView* self, PageView* page) {
 	gint _tmp15_ = 0;
 	gint _tmp16_ = 0;
 	gint _tmp17_ = 0;
-#line 216 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = page;
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp1_ == NULL) {
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = TRUE;
 #line 1080 "book-view.c"
 	} else {
 		GtkScrollbar* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp2_ = self->priv->scroll;
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp3_ = gtk_widget_get_visible ((GtkWidget*) _tmp2_);
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = !_tmp3_;
 #line 1090 "book-view.c"
 	}
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp0_) {
-#line 219 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
 #line 1096 "book-view.c"
 	}
-#line 222 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = self->priv->drawing_area;
-#line 222 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_get_allocation (_tmp4_, &_tmp5_);
-#line 222 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	allocation = _tmp5_;
-#line 223 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp6_ = page;
-#line 223 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp7_ = page_view_get_x_offset (_tmp6_);
-#line 223 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp8_ = _tmp7_;
-#line 223 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	left_edge = _tmp8_;
-#line 224 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp9_ = page;
-#line 224 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp10_ = page_view_get_x_offset (_tmp9_);
-#line 224 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp11_ = _tmp10_;
-#line 224 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp12_ = page;
-#line 224 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp13_ = page_view_get_width (_tmp12_);
-#line 224 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp14_ = _tmp13_;
-#line 224 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	right_edge = _tmp11_ + _tmp14_;
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp15_ = left_edge;
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp16_ = book_view_get_x_offset (self);
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp17_ = _tmp16_;
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if ((_tmp15_ - _tmp17_) < 0) {
 #line 1134 "book-view.c"
 		gint _tmp18_ = 0;
-#line 227 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp18_ = left_edge;
-#line 227 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_set_x_offset (self, _tmp18_);
 #line 1140 "book-view.c"
 	} else {
@@ -1143,29 +1143,29 @@ static void book_view_show_page_view (BookView* self, PageView* page) {
 		gint _tmp21_ = 0;
 		GtkAllocation _tmp22_ = {0};
 		gint _tmp23_ = 0;
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp19_ = right_edge;
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp20_ = book_view_get_x_offset (self);
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp21_ = _tmp20_;
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp22_ = allocation;
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp23_ = _tmp22_.width;
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		if ((_tmp19_ - _tmp21_) > _tmp23_) {
 #line 1159 "book-view.c"
 			gint _tmp24_ = 0;
 			GtkAllocation _tmp25_ = {0};
 			gint _tmp26_ = 0;
-#line 229 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp24_ = right_edge;
-#line 229 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp25_ = allocation;
-#line 229 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp26_ = _tmp25_.width;
-#line 229 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			book_view_set_x_offset (self, _tmp24_ - _tmp26_);
 #line 1171 "book-view.c"
 		}
@@ -1181,69 +1181,69 @@ static void book_view_select_page_view (BookView* self, PageView* page) {
 	gboolean _tmp3_ = FALSE;
 	PageView* _tmp5_ = NULL;
 	Page* _tmp10_ = NULL;
-#line 232 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	p = NULL;
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->selected_page_view;
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = page;
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_unref0 (p);
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
 #line 1199 "book-view.c"
 	}
-#line 239 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = page;
-#line 239 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_set_selected_page_view (self, _tmp2_);
-#line 241 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = self->priv->need_layout;
-#line 241 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp3_) {
-#line 242 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		self->priv->show_selected_page = TRUE;
 #line 1211 "book-view.c"
 	} else {
 		PageView* _tmp4_ = NULL;
-#line 244 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp4_ = page;
-#line 244 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_show_page_view (self, _tmp4_);
 #line 1218 "book-view.c"
 	}
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = page;
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp5_ != NULL) {
 #line 1224 "book-view.c"
 		PageView* _tmp6_ = NULL;
 		Page* _tmp7_ = NULL;
 		Page* _tmp8_ = NULL;
 		Page* _tmp9_ = NULL;
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp6_ = page;
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp7_ = page_view_get_page (_tmp6_);
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp8_ = _tmp7_;
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp9_ = _page_ref0 (_tmp8_);
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_unref0 (p);
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		p = _tmp9_;
 #line 1241 "book-view.c"
 	}
-#line 248 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp10_ = p;
-#line 248 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_emit_by_name (self, "page-selected", _tmp10_);
-#line 232 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_unref0 (p);
 #line 1249 "book-view.c"
 }
@@ -1266,112 +1266,112 @@ static void book_view_remove_cb (BookView* self, Book* book, Page* page) {
 	GHashTable* _tmp17_ = NULL;
 	Page* _tmp18_ = NULL;
 	PageView* _tmp19_ = NULL;
-#line 251 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 251 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (book != NULL);
-#line 251 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (page != NULL);
-#line 253 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->selected_page_view;
-#line 253 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = _page_view_ref0 (_tmp0_);
-#line 253 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	new_selection = _tmp1_;
-#line 256 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = page;
-#line 256 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = book_view_get_selected_page (self);
-#line 256 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = _tmp3_;
-#line 256 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp2_ == _tmp4_) {
 #line 1290 "book-view.c"
 		PageView* _tmp5_ = NULL;
 		PageView* _tmp6_ = NULL;
 		PageView* _tmp7_ = NULL;
 		PageView* _tmp8_ = NULL;
-#line 258 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp5_ = self->priv->selected_page_view;
-#line 258 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp6_ = book_view_get_prev_page (self, _tmp5_);
-#line 258 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_view_unref0 (new_selection);
-#line 258 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		new_selection = _tmp6_;
-#line 259 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp7_ = new_selection;
-#line 259 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp8_ = self->priv->selected_page_view;
-#line 259 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		if (_tmp7_ == _tmp8_) {
 #line 1309 "book-view.c"
 			PageView* _tmp9_ = NULL;
 			PageView* _tmp10_ = NULL;
-#line 260 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp9_ = self->priv->selected_page_view;
-#line 260 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp10_ = book_view_get_next_page (self, _tmp9_);
-#line 260 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_page_view_unref0 (new_selection);
-#line 260 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			new_selection = _tmp10_;
 #line 1320 "book-view.c"
 		}
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_view_unref0 (self->priv->selected_page_view);
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		self->priv->selected_page_view = NULL;
 #line 1326 "book-view.c"
 	}
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp11_ = self->priv->page_data;
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp12_ = page;
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp13_ = g_hash_table_lookup (_tmp11_, _tmp12_);
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp14_ = _page_view_ref0 ((PageView*) _tmp13_);
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	page_view = _tmp14_;
-#line 265 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("changed", TYPE_PAGE_VIEW, &_tmp15_, NULL, FALSE);
-#line 265 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (page_view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _book_view_page_view_changed_cb_page_view_changed, self);
-#line 266 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("size-changed", TYPE_PAGE_VIEW, &_tmp16_, NULL, FALSE);
-#line 266 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (page_view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _book_view_page_view_size_changed_cb_page_view_size_changed, self);
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp17_ = self->priv->page_data;
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp18_ = page;
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_hash_table_remove (_tmp17_, _tmp18_);
-#line 269 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp19_ = new_selection;
-#line 269 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_select_page_view (self, _tmp19_);
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
-#line 272 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
-#line 251 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (page_view);
-#line 251 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (new_selection);
 #line 1364 "book-view.c"
 }
 
 
 static void book_view_reorder_cb (BookView* self, Book* book) {
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (book != NULL);
-#line 277 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
 #line 1377 "book-view.c"
 }
@@ -1379,23 +1379,23 @@ static void book_view_reorder_cb (BookView* self, Book* book) {
 
 static void book_view_clear_cb (BookView* self, Book* book) {
 	GHashTable* _tmp0_ = NULL;
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (book != NULL);
-#line 283 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->page_data;
-#line 283 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_hash_table_remove_all (_tmp0_);
-#line 284 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (self->priv->selected_page_view);
-#line 284 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->selected_page_view = NULL;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_emit_by_name (self, "page-selected", NULL);
-#line 286 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
 #line 1401 "book-view.c"
 }
@@ -1403,17 +1403,17 @@ static void book_view_clear_cb (BookView* self, Book* book) {
 
 static gboolean book_view_configure_cb (BookView* self, GtkWidget* widget, GdkEventConfigure* event) {
 	gboolean result = FALSE;
-#line 290 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 290 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 290 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 292 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
-#line 293 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = FALSE;
-#line 293 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 1419 "book-view.c"
 }
@@ -1433,21 +1433,21 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 	gint _tmp50_ = 0;
 	gint spacing = 0;
 	gint x_offset = 0;
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 299 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 299 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	max_dpi = 0;
 #line 1441 "book-view.c"
 	{
 		gint i = 0;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
 #line 1446 "book-view.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp0_ = TRUE;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
 #line 1453 "book-view.c"
 				gint _tmp2_ = 0;
@@ -1462,85 +1462,85 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
 				gint _tmp12_ = 0;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp0_) {
 #line 1468 "book-view.c"
 					gint _tmp1_ = 0;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp1_ = i;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp1_ + 1;
 #line 1474 "book-view.c"
 				}
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp0_ = FALSE;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp2_ = i;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp3_ = self->priv->_book;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp4_ = book_get_n_pages (_tmp3_);
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp5_ = _tmp4_;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!(((guint) _tmp2_) < _tmp5_)) {
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
 #line 1490 "book-view.c"
 				}
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp6_ = self->priv->_book;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp7_ = i;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp8_ = book_get_page (_tmp6_, _tmp7_);
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page = _tmp8_;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp9_ = page;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp10_ = page_get_dpi (_tmp9_);
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp11_ = _tmp10_;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp12_ = max_dpi;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp11_ > _tmp12_) {
 #line 1510 "book-view.c"
 					Page* _tmp13_ = NULL;
 					gint _tmp14_ = 0;
 					gint _tmp15_ = 0;
-#line 304 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp13_ = page;
-#line 304 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp14_ = page_get_dpi (_tmp13_);
-#line 304 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp15_ = _tmp14_;
-#line 304 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					max_dpi = _tmp15_;
 #line 1522 "book-view.c"
 				}
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (page);
 #line 1526 "book-view.c"
 			}
 		}
 	}
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	max_width = 0;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	max_height = 0;
 #line 1534 "book-view.c"
 	{
 		gint i = 0;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
 #line 1539 "book-view.c"
 		{
 			gboolean _tmp16_ = FALSE;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp16_ = TRUE;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
 #line 1546 "book-view.c"
 				gint _tmp18_ = 0;
@@ -1573,143 +1573,143 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 				gint _tmp42_ = 0;
 				gint _tmp44_ = 0;
 				gint _tmp45_ = 0;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp16_) {
 #line 1579 "book-view.c"
 					gint _tmp17_ = 0;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp17_ = i;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp17_ + 1;
 #line 1585 "book-view.c"
 				}
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp16_ = FALSE;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp18_ = i;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp19_ = self->priv->_book;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp20_ = book_get_n_pages (_tmp19_);
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp21_ = _tmp20_;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!(((guint) _tmp18_) < _tmp21_)) {
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
 #line 1601 "book-view.c"
 				}
-#line 311 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp22_ = self->priv->_book;
-#line 311 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp23_ = i;
-#line 311 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp24_ = book_get_page (_tmp22_, _tmp23_);
-#line 311 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page = _tmp24_;
-#line 312 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp25_ = page;
-#line 312 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp26_ = page_get_width (_tmp25_);
-#line 312 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp27_ = _tmp26_;
-#line 312 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				w = _tmp27_;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp28_ = page;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp29_ = page_get_height (_tmp28_);
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp30_ = _tmp29_;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				h = _tmp30_;
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp31_ = w;
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp32_ = max_dpi;
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp33_ = page;
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp34_ = page_get_dpi (_tmp33_);
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp35_ = _tmp34_;
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				w = (gint) (((((gdouble) _tmp31_) * _tmp32_) / _tmp35_) + 0.5);
-#line 317 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp36_ = h;
-#line 317 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp37_ = max_dpi;
-#line 317 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp38_ = page;
-#line 317 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp39_ = page_get_dpi (_tmp38_);
-#line 317 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp40_ = _tmp39_;
-#line 317 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				h = (gint) (((((gdouble) _tmp36_) * _tmp37_) / _tmp40_) + 0.5);
-#line 319 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp41_ = w;
-#line 319 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp42_ = max_width;
-#line 319 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp41_ > _tmp42_) {
 #line 1657 "book-view.c"
 					gint _tmp43_ = 0;
-#line 320 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp43_ = w;
-#line 320 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					max_width = _tmp43_;
 #line 1663 "book-view.c"
 				}
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp44_ = h;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp45_ = max_height;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp44_ > _tmp45_) {
 #line 1671 "book-view.c"
 					gint _tmp46_ = 0;
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp46_ = h;
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					max_height = _tmp46_;
 #line 1677 "book-view.c"
 				}
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (page);
 #line 1681 "book-view.c"
 			}
 		}
 	}
-#line 325 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp47_ = width;
-#line 325 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp48_ = height;
-#line 325 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	aspect = ((gdouble) _tmp47_) / _tmp48_;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp49_ = max_width;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp50_ = max_height;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	max_aspect = ((gdouble) _tmp49_) / _tmp50_;
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	spacing = 12;
-#line 330 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_vala_book_width = 0;
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_vala_book_height = 0;
 #line 1703 "book-view.c"
 	{
 		gint i = 0;
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
 #line 1708 "book-view.c"
 		{
 			gboolean _tmp51_ = FALSE;
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp51_ = TRUE;
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
 #line 1715 "book-view.c"
 				gint _tmp53_ = 0;
@@ -1737,53 +1737,53 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 				gint _tmp95_ = 0;
 				gint _tmp96_ = 0;
 				gint _tmp97_ = 0;
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp51_) {
 #line 1743 "book-view.c"
 					gint _tmp52_ = 0;
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp52_ = i;
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp52_ + 1;
 #line 1749 "book-view.c"
 				}
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp51_ = FALSE;
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp53_ = i;
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp54_ = self->priv->_book;
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp55_ = book_get_n_pages (_tmp54_);
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp56_ = _tmp55_;
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!(((guint) _tmp53_) < _tmp56_)) {
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
 #line 1765 "book-view.c"
 				}
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp57_ = i;
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp58_ = book_view_get_nth_page (self, _tmp57_);
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page = _tmp58_;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp59_ = page;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp60_ = page_view_get_page (_tmp59_);
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp61_ = _tmp60_;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp62_ = _page_ref0 (_tmp61_);
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				p = _tmp62_;
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp63_ = max_aspect;
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp64_ = aspect;
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp63_ > _tmp64_) {
 #line 1789 "book-view.c"
 					gint w = 0;
@@ -1798,31 +1798,31 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 					gint _tmp73_ = 0;
 					PageView* _tmp74_ = NULL;
 					gint _tmp75_ = 0;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp65_ = p;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp66_ = page_get_width (_tmp65_);
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp67_ = _tmp66_;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp68_ = max_dpi;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp69_ = width;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp70_ = p;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp71_ = page_get_dpi (_tmp70_);
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp72_ = _tmp71_;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp73_ = max_width;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					w = (gint) (((((gdouble) _tmp67_) * _tmp68_) * _tmp69_) / (_tmp72_ * _tmp73_));
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp74_ = page;
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp75_ = w;
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					page_view_set_width (_tmp74_, _tmp75_);
 #line 1828 "book-view.c"
 				} else {
@@ -1838,102 +1838,102 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 					gint _tmp84_ = 0;
 					PageView* _tmp85_ = NULL;
 					gint _tmp86_ = 0;
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp76_ = p;
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp77_ = page_get_height (_tmp76_);
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp78_ = _tmp77_;
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp79_ = max_dpi;
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp80_ = height;
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp81_ = p;
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp82_ = page_get_dpi (_tmp81_);
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp83_ = _tmp82_;
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp84_ = max_height;
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					h = (gint) (((((gdouble) _tmp78_) * _tmp79_) * _tmp80_) / (_tmp83_ * _tmp84_));
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp85_ = page;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp86_ = h;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					page_view_set_height (_tmp85_, _tmp86_);
 #line 1868 "book-view.c"
 				}
-#line 351 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp87_ = page;
-#line 351 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp88_ = page_view_get_height (_tmp87_);
-#line 351 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp89_ = _tmp88_;
-#line 351 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				h = _tmp89_;
-#line 352 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp90_ = h;
-#line 352 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp91_ = _vala_book_height;
-#line 352 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp90_ > _tmp91_) {
 #line 1884 "book-view.c"
 					gint _tmp92_ = 0;
-#line 353 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp92_ = h;
-#line 353 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_vala_book_height = _tmp92_;
 #line 1890 "book-view.c"
 				}
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp93_ = _vala_book_width;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp94_ = page;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp95_ = page_view_get_width (_tmp94_);
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp96_ = _tmp95_;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_vala_book_width = _tmp93_ + _tmp96_;
-#line 355 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp97_ = i;
-#line 355 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp97_ != 0) {
 #line 1906 "book-view.c"
 					gint _tmp98_ = 0;
 					gint _tmp99_ = 0;
-#line 356 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp98_ = _vala_book_width;
-#line 356 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp99_ = spacing;
-#line 356 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_vala_book_width = _tmp98_ + _tmp99_;
 #line 1915 "book-view.c"
 				}
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (p);
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (page);
 #line 1921 "book-view.c"
 			}
 		}
 	}
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	x_offset = 0;
 #line 1927 "book-view.c"
 	{
 		gint i = 0;
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
 #line 1932 "book-view.c"
 		{
 			gboolean _tmp100_ = FALSE;
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp100_ = TRUE;
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
 #line 1939 "book-view.c"
 				gint _tmp102_ = 0;
@@ -1955,83 +1955,83 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 				PageView* _tmp117_ = NULL;
 				gint _tmp118_ = 0;
 				gint _tmp119_ = 0;
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp100_) {
 #line 1961 "book-view.c"
 					gint _tmp101_ = 0;
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp101_ = i;
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp101_ + 1;
 #line 1967 "book-view.c"
 				}
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp100_ = FALSE;
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp102_ = i;
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp103_ = self->priv->_book;
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp104_ = book_get_n_pages (_tmp103_);
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp105_ = _tmp104_;
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!(((guint) _tmp102_) < _tmp105_)) {
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
 #line 1983 "book-view.c"
 				}
-#line 362 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp106_ = i;
-#line 362 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp107_ = book_view_get_nth_page (self, _tmp106_);
-#line 362 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page = _tmp107_;
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp108_ = page;
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp109_ = x_offset;
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page_view_set_x_offset (_tmp108_, _tmp109_);
-#line 366 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp110_ = x_offset;
-#line 366 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp111_ = page;
-#line 366 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp112_ = page_view_get_width (_tmp111_);
-#line 366 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp113_ = _tmp112_;
-#line 366 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp114_ = spacing;
-#line 366 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				x_offset = _tmp110_ + (_tmp113_ + _tmp114_);
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp115_ = page;
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp116_ = height;
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp117_ = page;
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp118_ = page_view_get_height (_tmp117_);
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp119_ = _tmp118_;
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page_view_set_y_offset (_tmp115_, (_tmp116_ - _tmp119_) / 2);
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (page);
 #line 2023 "book-view.c"
 			}
 		}
 	}
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (book_width) {
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		*book_width = _vala_book_width;
 #line 2031 "book-view.c"
 	}
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (book_height) {
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		*book_height = _vala_book_height;
 #line 2037 "book-view.c"
 	}
@@ -2069,79 +2069,79 @@ static void book_view_layout (BookView* self) {
 	GtkAllocation _tmp20_ = {0};
 	gint _tmp21_ = 0;
 	gboolean _tmp54_ = FALSE;
-#line 373 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 375 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->need_layout;
-#line 375 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (!_tmp0_) {
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
 #line 2081 "book-view.c"
 	}
-#line 378 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->laying_out = TRUE;
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = self->priv->drawing_area;
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_get_allocation (_tmp1_, &_tmp2_);
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	allocation = _tmp2_;
-#line 383 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_get_allocation ((GtkWidget*) self, &_tmp3_);
-#line 383 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	box_allocation = _tmp3_;
-#line 386 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	right_aligned = TRUE;
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = self->priv->adjustment;
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = gtk_adjustment_get_value (_tmp4_);
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp6_ = self->priv->adjustment;
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp7_ = gtk_adjustment_get_upper (_tmp6_);
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp8_ = self->priv->adjustment;
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp9_ = gtk_adjustment_get_page_size (_tmp8_);
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp5_ < (_tmp7_ - _tmp9_)) {
-#line 388 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		right_aligned = FALSE;
 #line 2113 "book-view.c"
 	}
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp10_ = allocation;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp11_ = _tmp10_.width;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	width = (gint) _tmp11_;
-#line 392 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp12_ = box_allocation;
-#line 392 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp13_ = _tmp12_.height;
-#line 392 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp14_ = gtk_container_get_border_width ((GtkContainer*) self);
-#line 392 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	height = (gint) (_tmp13_ - (_tmp14_ * 2));
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp15_ = width;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp16_ = height;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_layout_into (self, _tmp15_, _tmp16_, &_tmp17_, &_tmp18_);
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_width = _tmp17_;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_height = _tmp18_;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp19_ = book_width;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp20_ = allocation;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp21_ = _tmp20_.width;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp19_ > _tmp21_) {
 #line 2147 "book-view.c"
 		GtkAllocation _tmp22_ = {0};
@@ -2163,82 +2163,82 @@ static void book_view_layout (BookView* self) {
 		gboolean _tmp37_ = FALSE;
 		gboolean _tmp38_ = FALSE;
 		GtkScrollbar* _tmp43_ = NULL;
-#line 400 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp22_ = allocation;
-#line 400 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp23_ = _tmp22_.height;
-#line 400 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		height = _tmp23_;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp24_ = width;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp25_ = height;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_layout_into (self, _tmp24_, _tmp25_, &_tmp26_, &_tmp27_);
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_width = _tmp26_;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_height = _tmp27_;
-#line 404 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp28_ = self->priv->adjustment;
-#line 404 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_adjustment_set_lower (_tmp28_, (gdouble) 0);
-#line 405 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp29_ = self->priv->adjustment;
-#line 405 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp30_ = book_width;
-#line 405 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_adjustment_set_upper (_tmp29_, (gdouble) _tmp30_);
-#line 406 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp31_ = self->priv->adjustment;
-#line 406 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp32_ = allocation;
-#line 406 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp33_ = _tmp32_.width;
-#line 406 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_adjustment_set_page_size (_tmp31_, (gdouble) _tmp33_);
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp34_ = book_width;
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp35_ = allocation;
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp36_ = _tmp35_.width;
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		max_offset = _tmp34_ - _tmp36_;
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp38_ = right_aligned;
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		if (_tmp38_) {
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp37_ = TRUE;
 #line 2215 "book-view.c"
 		} else {
 			gint _tmp39_ = 0;
 			gint _tmp40_ = 0;
 			gint _tmp41_ = 0;
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp39_ = book_view_get_x_offset (self);
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp40_ = _tmp39_;
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp41_ = max_offset;
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp37_ = _tmp40_ > _tmp41_;
 #line 2228 "book-view.c"
 		}
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		if (_tmp37_) {
 #line 2232 "book-view.c"
 			gint _tmp42_ = 0;
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp42_ = max_offset;
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			book_view_set_x_offset (self, _tmp42_);
 #line 2238 "book-view.c"
 		}
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp43_ = self->priv->scroll;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_widget_set_visible ((GtkWidget*) _tmp43_, TRUE);
 #line 2244 "book-view.c"
 	} else {
@@ -2253,57 +2253,57 @@ static void book_view_layout (BookView* self) {
 		gint _tmp51_ = 0;
 		GtkAdjustment* _tmp52_ = NULL;
 		gint _tmp53_ = 0;
-#line 417 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp44_ = self->priv->scroll;
-#line 417 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_widget_set_visible ((GtkWidget*) _tmp44_, FALSE);
-#line 418 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp45_ = book_width;
-#line 418 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp46_ = allocation;
-#line 418 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp47_ = _tmp46_.width;
-#line 418 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		offset = (_tmp45_ - _tmp47_) / 2;
-#line 419 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp48_ = self->priv->adjustment;
-#line 419 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp49_ = offset;
-#line 419 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_adjustment_set_lower (_tmp48_, (gdouble) _tmp49_);
-#line 420 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp50_ = self->priv->adjustment;
-#line 420 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp51_ = offset;
-#line 420 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_adjustment_set_upper (_tmp50_, (gdouble) _tmp51_);
-#line 421 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp52_ = self->priv->adjustment;
-#line 421 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		gtk_adjustment_set_page_size (_tmp52_, (gdouble) 0);
-#line 422 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp53_ = offset;
-#line 422 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_set_x_offset (self, _tmp53_);
 #line 2289 "book-view.c"
 	}
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp54_ = self->priv->show_selected_page;
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp54_) {
 #line 2295 "book-view.c"
 		PageView* _tmp55_ = NULL;
-#line 426 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp55_ = self->priv->selected_page_view;
-#line 426 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_show_page_view (self, _tmp55_);
 #line 2301 "book-view.c"
 	}
-#line 428 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = FALSE;
-#line 429 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->show_selected_page = FALSE;
-#line 430 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->laying_out = FALSE;
 #line 2309 "book-view.c"
 }
@@ -2323,51 +2323,51 @@ static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* c
 	gdouble _tmp5_ = 0.0;
 	gdouble _tmp6_ = 0.0;
 	gdouble _tmp7_ = 0.0;
-#line 433 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 433 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 433 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (context != NULL, FALSE);
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->_book;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = book_get_n_pages (_tmp0_);
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = _tmp1_;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp2_ == ((guint) 0)) {
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		result = FALSE;
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
 #line 2345 "book-view.c"
 	}
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_layout (self);
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = context;
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	cairo_clip_extents (_tmp3_, &_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_);
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	left = _tmp4_;
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	top = _tmp5_;
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	right = _tmp6_;
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	bottom = _tmp7_;
 #line 2361 "book-view.c"
 	{
 		gint i = 0;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
 #line 2366 "book-view.c"
 		{
 			gboolean _tmp8_ = FALSE;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp8_ = TRUE;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
 #line 2373 "book-view.c"
 				gint _tmp10_ = 0;
@@ -2405,125 +2405,125 @@ static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* c
 				PageView* _tmp41_ = NULL;
 				gboolean _tmp42_ = FALSE;
 				gboolean _tmp43_ = FALSE;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp8_) {
 #line 2411 "book-view.c"
 					gint _tmp9_ = 0;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp9_ = i;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp9_ + 1;
 #line 2417 "book-view.c"
 				}
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp8_ = FALSE;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp10_ = i;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp11_ = self->priv->_book;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp12_ = book_get_n_pages (_tmp11_);
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp13_ = _tmp12_;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!(((guint) _tmp10_) < _tmp13_)) {
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
 #line 2433 "book-view.c"
 				}
-#line 446 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp14_ = i;
-#line 446 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp15_ = book_view_get_nth_page (self, _tmp14_);
-#line 446 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page = _tmp15_;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp16_ = page;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp17_ = page_view_get_x_offset (_tmp16_);
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp18_ = _tmp17_;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp19_ = book_view_get_x_offset (self);
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp20_ = _tmp19_;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				left_edge = _tmp18_ - _tmp20_;
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp21_ = page;
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp22_ = page_view_get_x_offset (_tmp21_);
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp23_ = _tmp22_;
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp24_ = page;
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp25_ = page_view_get_width (_tmp24_);
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp26_ = _tmp25_;
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp27_ = book_view_get_x_offset (self);
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp28_ = _tmp27_;
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				right_edge = (_tmp23_ + _tmp26_) - _tmp28_;
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp30_ = right_edge;
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp31_ = left;
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (((gdouble) _tmp30_) < _tmp31_) {
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp29_ = TRUE;
 #line 2479 "book-view.c"
 				} else {
 					gint _tmp32_ = 0;
 					gdouble _tmp33_ = 0.0;
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp32_ = left_edge;
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp33_ = right;
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp29_ = ((gdouble) _tmp32_) > _tmp33_;
 #line 2489 "book-view.c"
 				}
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp29_) {
-#line 452 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_view_unref0 (page);
-#line 452 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					continue;
 #line 2497 "book-view.c"
 				}
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp34_ = context;
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				cairo_save (_tmp34_);
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp35_ = context;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp36_ = book_view_get_x_offset (self);
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp37_ = _tmp36_;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				cairo_translate (_tmp35_, (gdouble) (-_tmp37_), (gdouble) 0);
-#line 456 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp38_ = page;
-#line 456 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp39_ = context;
-#line 456 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page_view_render (_tmp38_, _tmp39_);
-#line 457 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp40_ = context;
-#line 457 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				cairo_restore (_tmp40_);
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp41_ = page;
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp42_ = page_view_get_selected (_tmp41_);
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp43_ = _tmp42_;
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp43_) {
 #line 2529 "book-view.c"
 					GtkWidget* _tmp44_ = NULL;
@@ -2543,53 +2543,53 @@ static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* c
 					PageView* _tmp58_ = NULL;
 					gint _tmp59_ = 0;
 					gint _tmp60_ = 0;
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp44_ = self->priv->drawing_area;
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp45_ = gtk_widget_get_style_context (_tmp44_);
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp46_ = context;
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp47_ = page;
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp48_ = page_view_get_x_offset (_tmp47_);
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp49_ = _tmp48_;
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp50_ = book_view_get_x_offset (self);
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp51_ = _tmp50_;
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp52_ = page;
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp53_ = page_view_get_y_offset (_tmp52_);
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp54_ = _tmp53_;
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp55_ = page;
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp56_ = page_view_get_width (_tmp55_);
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp57_ = _tmp56_;
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp58_ = page;
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp59_ = page_view_get_height (_tmp58_);
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp60_ = _tmp59_;
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					gtk_render_focus (_tmp45_, _tmp46_, (gdouble) (_tmp49_ - _tmp51_), (gdouble) _tmp54_, (gdouble) _tmp57_, (gdouble) _tmp60_);
 #line 2583 "book-view.c"
 				}
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (page);
 #line 2587 "book-view.c"
 			}
 		}
 	}
-#line 467 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = FALSE;
-#line 467 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 2595 "book-view.c"
 }
@@ -2600,25 +2600,25 @@ static PageView* book_view_get_page_at (BookView* self, gint x, gint y, gint* x_
 	gint _vala_y_ = 0;
 	PageView* result = NULL;
 	gint _tmp0_ = 0;
-#line 470 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 472 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_vala_y_ = 0;
-#line 472 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = _vala_y_;
-#line 472 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_vala_x_ = _tmp0_;
 #line 2612 "book-view.c"
 	{
 		gint i = 0;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
 #line 2617 "book-view.c"
 		{
 			gboolean _tmp1_ = FALSE;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp1_ = TRUE;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
 #line 2624 "book-view.c"
 				gint _tmp3_ = 0;
@@ -2651,187 +2651,187 @@ static PageView* book_view_get_page_at (BookView* self, gint x, gint y, gint* x_
 				gboolean _tmp25_ = FALSE;
 				gint _tmp26_ = 0;
 				gint _tmp27_ = 0;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!_tmp1_) {
 #line 2657 "book-view.c"
 					gint _tmp2_ = 0;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp2_ = i;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					i = _tmp2_ + 1;
 #line 2663 "book-view.c"
 				}
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp1_ = FALSE;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp3_ = i;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp4_ = self->priv->_book;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp5_ = book_get_n_pages (_tmp4_);
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp6_ = _tmp5_;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (!(((guint) _tmp3_) < _tmp6_)) {
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
 #line 2679 "book-view.c"
 				}
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp7_ = i;
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp8_ = book_view_get_nth_page (self, _tmp7_);
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page = _tmp8_;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp9_ = page;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp10_ = page_view_get_x_offset (_tmp9_);
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp11_ = _tmp10_;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				left = _tmp11_;
-#line 477 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp12_ = left;
-#line 477 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp13_ = page;
-#line 477 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp14_ = page_view_get_width (_tmp13_);
-#line 477 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp15_ = _tmp14_;
-#line 477 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				right = _tmp12_ + _tmp15_;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp16_ = page;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp17_ = page_view_get_y_offset (_tmp16_);
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp18_ = _tmp17_;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				top = _tmp18_;
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp19_ = top;
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp20_ = page;
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp21_ = page_view_get_height (_tmp20_);
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp22_ = _tmp21_;
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				bottom = _tmp19_ + _tmp22_;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp26_ = x;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp27_ = left;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp26_ >= _tmp27_) {
 #line 2729 "book-view.c"
 					gint _tmp28_ = 0;
 					gint _tmp29_ = 0;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp28_ = x;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp29_ = right;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp25_ = _tmp28_ <= _tmp29_;
 #line 2738 "book-view.c"
 				} else {
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp25_ = FALSE;
 #line 2742 "book-view.c"
 				}
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp25_) {
 #line 2746 "book-view.c"
 					gint _tmp30_ = 0;
 					gint _tmp31_ = 0;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp30_ = y;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp31_ = top;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp24_ = _tmp30_ >= _tmp31_;
 #line 2755 "book-view.c"
 				} else {
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp24_ = FALSE;
 #line 2759 "book-view.c"
 				}
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp24_) {
 #line 2763 "book-view.c"
 					gint _tmp32_ = 0;
 					gint _tmp33_ = 0;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp32_ = y;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp33_ = bottom;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp23_ = _tmp32_ <= _tmp33_;
 #line 2772 "book-view.c"
 				} else {
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp23_ = FALSE;
 #line 2776 "book-view.c"
 				}
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp23_) {
 #line 2780 "book-view.c"
 					gint _tmp34_ = 0;
 					gint _tmp35_ = 0;
 					gint _tmp36_ = 0;
 					gint _tmp37_ = 0;
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp34_ = x;
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp35_ = left;
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_vala_x_ = _tmp34_ - _tmp35_;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp36_ = y;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp37_ = top;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_vala_y_ = _tmp36_ - _tmp37_;
-#line 484 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					result = page;
-#line 484 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					if (x_) {
-#line 484 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						*x_ = _vala_x_;
 #line 2803 "book-view.c"
 					}
-#line 484 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					if (y_) {
-#line 484 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						*y_ = _vala_y_;
 #line 2809 "book-view.c"
 					}
-#line 484 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					return result;
 #line 2813 "book-view.c"
 				}
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (page);
 #line 2817 "book-view.c"
 			}
 		}
 	}
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = NULL;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (x_) {
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		*x_ = _vala_x_;
 #line 2827 "book-view.c"
 	}
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (y_) {
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		*y_ = _vala_y_;
 #line 2833 "book-view.c"
 	}
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 2837 "book-view.c"
 }
@@ -2849,27 +2849,27 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent
 	guint _tmp15_ = 0U;
 	GdkEventButton* _tmp30_ = NULL;
 	guint _tmp31_ = 0U;
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_layout (self);
-#line 495 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->drawing_area;
-#line 495 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_grab_focus (_tmp0_);
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	x = 0;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	y = 0;
-#line 498 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = event;
-#line 498 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = _tmp1_->type;
-#line 498 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp2_ == GDK_BUTTON_PRESS) {
 #line 2875 "book-view.c"
 		GdkEventButton* _tmp3_ = NULL;
@@ -2882,128 +2882,128 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent
 		gint _tmp10_ = 0;
 		PageView* _tmp11_ = NULL;
 		PageView* _tmp12_ = NULL;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp3_ = event;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp4_ = _tmp3_->x;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp5_ = book_view_get_x_offset (self);
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp6_ = _tmp5_;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp7_ = event;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp8_ = _tmp7_->y;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp11_ = book_view_get_page_at (self, (gint) (_tmp4_ + _tmp6_), (gint) _tmp8_, &_tmp9_, &_tmp10_);
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		x = _tmp9_;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		y = _tmp10_;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp12_ = _tmp11_;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_select_page_view (self, _tmp12_);
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_view_unref0 (_tmp12_);
 #line 2910 "book-view.c"
 	}
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp13_ = self->priv->selected_page_view;
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp13_ == NULL) {
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		result = FALSE;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
 #line 2920 "book-view.c"
 	}
-#line 505 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp14_ = event;
-#line 505 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp15_ = _tmp14_->button;
-#line 505 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp15_ == ((guint) 1)) {
 #line 2928 "book-view.c"
 		GdkEventButton* _tmp16_ = NULL;
 		GdkEventType _tmp17_ = 0;
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp16_ = event;
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp17_ = _tmp16_->type;
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		if (_tmp17_ == GDK_BUTTON_PRESS) {
 #line 2937 "book-view.c"
 			PageView* _tmp18_ = NULL;
 			gint _tmp19_ = 0;
 			gint _tmp20_ = 0;
-#line 508 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp18_ = self->priv->selected_page_view;
-#line 508 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp19_ = x;
-#line 508 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp20_ = y;
-#line 508 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			page_view_button_press (_tmp18_, _tmp19_, _tmp20_);
 #line 2949 "book-view.c"
 		} else {
 			GdkEventButton* _tmp21_ = NULL;
 			GdkEventType _tmp22_ = 0;
-#line 509 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp21_ = event;
-#line 509 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp22_ = _tmp21_->type;
-#line 509 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			if (_tmp22_ == GDK_BUTTON_RELEASE) {
 #line 2959 "book-view.c"
 				PageView* _tmp23_ = NULL;
 				gint _tmp24_ = 0;
 				gint _tmp25_ = 0;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp23_ = self->priv->selected_page_view;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp24_ = x;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp25_ = y;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page_view_button_release (_tmp23_, _tmp24_, _tmp25_);
 #line 2971 "book-view.c"
 			} else {
 				GdkEventButton* _tmp26_ = NULL;
 				GdkEventType _tmp27_ = 0;
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp26_ = event;
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp27_ = _tmp26_->type;
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp27_ == GDK_2BUTTON_PRESS) {
 #line 2981 "book-view.c"
 					Page* _tmp28_ = NULL;
 					Page* _tmp29_ = NULL;
-#line 512 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp28_ = book_view_get_selected_page (self);
-#line 512 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp29_ = _tmp28_;
-#line 512 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					g_signal_emit_by_name (self, "show-page", _tmp29_);
 #line 2990 "book-view.c"
 				}
 			}
 		}
 	}
-#line 516 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp30_ = event;
-#line 516 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp31_ = _tmp30_->button;
-#line 516 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp31_ == ((guint) 3)) {
-#line 517 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		g_signal_emit_by_name (self, "show-menu");
 #line 3003 "book-view.c"
 	}
-#line 519 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = FALSE;
-#line 519 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 3009 "book-view.c"
 }
@@ -3019,41 +3019,41 @@ static void book_view_set_cursor (BookView* self, GdkCursorType cursor) {
 	GtkWidget* _tmp5_ = NULL;
 	GdkWindow* _tmp6_ = NULL;
 	GdkCursor* _tmp7_ = NULL;
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->cursor;
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = cursor;
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 527 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_g_object_unref0 (c);
-#line 527 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
 #line 3035 "book-view.c"
 	}
-#line 528 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = cursor;
-#line 528 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->cursor = _tmp2_;
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = cursor;
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = gdk_cursor_new (_tmp3_);
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (c);
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	c = _tmp4_;
-#line 531 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = self->priv->drawing_area;
-#line 531 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp6_ = gtk_widget_get_window (_tmp5_);
-#line 531 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp7_ = c;
-#line 531 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gdk_window_set_cursor (_tmp6_, _tmp7_);
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (c);
 #line 3059 "book-view.c"
 }
@@ -3065,34 +3065,34 @@ static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEvent
 	gboolean _tmp0_ = FALSE;
 	PageView* _tmp1_ = NULL;
 	GdkCursorType _tmp38_ = 0;
-#line 534 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 534 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 534 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 536 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	cursor = GDK_ARROW;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = self->priv->selected_page_view;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp1_ != NULL) {
 #line 3081 "book-view.c"
 		GdkEventMotion* _tmp2_ = NULL;
 		GdkModifierType _tmp3_ = 0;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp2_ = event;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp3_ = _tmp2_->state;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = (_tmp3_ & GDK_BUTTON1_MASK) != 0;
 #line 3090 "book-view.c"
 	} else {
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = FALSE;
 #line 3094 "book-view.c"
 	}
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp0_) {
 #line 3098 "book-view.c"
 		gint x = 0;
@@ -3115,49 +3115,49 @@ static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEvent
 		PageView* _tmp19_ = NULL;
 		GdkCursorType _tmp20_ = 0;
 		GdkCursorType _tmp21_ = 0;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp4_ = event;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp5_ = _tmp4_->x;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp6_ = book_view_get_x_offset (self);
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp7_ = _tmp6_;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp8_ = self->priv->selected_page_view;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp9_ = page_view_get_x_offset (_tmp8_);
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp10_ = _tmp9_;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		x = (gint) ((_tmp5_ + _tmp7_) - _tmp10_);
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp11_ = event;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp12_ = _tmp11_->y;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp13_ = self->priv->selected_page_view;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp14_ = page_view_get_y_offset (_tmp13_);
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp15_ = _tmp14_;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		y = (gint) (_tmp12_ - _tmp15_);
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp16_ = self->priv->selected_page_view;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp17_ = x;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp18_ = y;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		page_view_motion (_tmp16_, _tmp17_, _tmp18_);
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp19_ = self->priv->selected_page_view;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp20_ = page_view_get_cursor (_tmp19_);
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp21_ = _tmp20_;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		cursor = _tmp21_;
 #line 3163 "book-view.c"
 	} else {
@@ -3174,29 +3174,29 @@ static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEvent
 		gint _tmp29_ = 0;
 		PageView* _tmp30_ = NULL;
 		PageView* _tmp31_ = NULL;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp22_ = event;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp23_ = _tmp22_->x;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp24_ = book_view_get_x_offset (self);
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp25_ = _tmp24_;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp26_ = event;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp27_ = _tmp26_->y;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp30_ = book_view_get_page_at (self, (gint) (_tmp23_ + _tmp25_), (gint) _tmp27_, &_tmp28_, &_tmp29_);
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		x = _tmp28_;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		y = _tmp29_;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		over_page = _tmp30_;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp31_ = over_page;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		if (_tmp31_ != NULL) {
 #line 3202 "book-view.c"
 			PageView* _tmp32_ = NULL;
@@ -3205,35 +3205,35 @@ static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEvent
 			PageView* _tmp35_ = NULL;
 			GdkCursorType _tmp36_ = 0;
 			GdkCursorType _tmp37_ = 0;
-#line 552 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp32_ = over_page;
-#line 552 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp33_ = x;
-#line 552 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp34_ = y;
-#line 552 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			page_view_motion (_tmp32_, _tmp33_, _tmp34_);
-#line 553 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp35_ = over_page;
-#line 553 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp36_ = page_view_get_cursor (_tmp35_);
-#line 553 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp37_ = _tmp36_;
-#line 553 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			cursor = _tmp37_;
 #line 3225 "book-view.c"
 		}
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_view_unref0 (over_page);
 #line 3229 "book-view.c"
 	}
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp38_ = cursor;
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_set_cursor (self, _tmp38_);
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = FALSE;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 3239 "book-view.c"
 }
@@ -3243,88 +3243,88 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 	gboolean result = FALSE;
 	GdkEventKey* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 562 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 562 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 562 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = event;
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	switch (_tmp1_) {
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xff50:
 #line 3261 "book-view.c"
 		{
 			Book* _tmp2_ = NULL;
 			Page* _tmp3_ = NULL;
 			Page* _tmp4_ = NULL;
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp2_ = self->priv->_book;
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp3_ = book_get_page (_tmp2_, 0);
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp4_ = _tmp3_;
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			book_view_set_selected_page (self, _tmp4_);
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_page_unref0 (_tmp4_);
-#line 568 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			result = TRUE;
-#line 568 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
 #line 3280 "book-view.c"
 		}
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xff51:
 #line 3284 "book-view.c"
 		{
 			PageView* _tmp5_ = NULL;
 			PageView* _tmp6_ = NULL;
 			PageView* _tmp7_ = NULL;
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp5_ = self->priv->selected_page_view;
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp6_ = book_view_get_prev_page (self, _tmp5_);
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp7_ = _tmp6_;
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			book_view_select_page_view (self, _tmp7_);
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_page_view_unref0 (_tmp7_);
-#line 571 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			result = TRUE;
-#line 571 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
 #line 3303 "book-view.c"
 		}
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xff53:
 #line 3307 "book-view.c"
 		{
 			PageView* _tmp8_ = NULL;
 			PageView* _tmp9_ = NULL;
 			PageView* _tmp10_ = NULL;
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp8_ = self->priv->selected_page_view;
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp9_ = book_view_get_next_page (self, _tmp8_);
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp10_ = _tmp9_;
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			book_view_select_page_view (self, _tmp10_);
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_page_view_unref0 (_tmp10_);
-#line 574 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			result = TRUE;
-#line 574 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
 #line 3326 "book-view.c"
 		}
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xFF57:
 #line 3330 "book-view.c"
 		{
@@ -3334,33 +3334,33 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 			guint _tmp14_ = 0U;
 			Page* _tmp15_ = NULL;
 			Page* _tmp16_ = NULL;
-#line 576 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp11_ = self->priv->_book;
-#line 576 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp12_ = self->priv->_book;
-#line 576 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp13_ = book_get_n_pages (_tmp12_);
-#line 576 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp14_ = _tmp13_;
-#line 576 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp15_ = book_get_page (_tmp11_, ((gint) _tmp14_) - 1);
-#line 576 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp16_ = _tmp15_;
-#line 576 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			book_view_set_selected_page (self, _tmp16_);
-#line 576 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_page_unref0 (_tmp16_);
-#line 577 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			result = TRUE;
-#line 577 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
 #line 3358 "book-view.c"
 		}
 		default:
 		{
-#line 580 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			result = FALSE;
-#line 580 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
 #line 3366 "book-view.c"
 		}
@@ -3371,19 +3371,19 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 static gboolean book_view_focus_cb (BookView* self, GtkWidget* widget, GdkEventFocus* event) {
 	gboolean result = FALSE;
 	PageView* _tmp0_ = NULL;
-#line 584 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 584 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 584 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 586 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->selected_page_view;
-#line 586 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_set_selected_page_view (self, _tmp0_);
-#line 587 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = FALSE;
-#line 587 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 3389 "book-view.c"
 }
@@ -3391,15 +3391,15 @@ static gboolean book_view_focus_cb (BookView* self, GtkWidget* widget, GdkEventF
 
 static void book_view_scroll_cb (BookView* self, GtkAdjustment* adjustment) {
 	gboolean _tmp0_ = FALSE;
-#line 590 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 590 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (adjustment != NULL);
-#line 592 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->laying_out;
-#line 592 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (!_tmp0_) {
-#line 593 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_redraw (self);
 #line 3405 "book-view.c"
 	}
@@ -3408,11 +3408,11 @@ static void book_view_scroll_cb (BookView* self, GtkAdjustment* adjustment) {
 
 void book_view_redraw (BookView* self) {
 	GtkWidget* _tmp0_ = NULL;
-#line 596 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->drawing_area;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_queue_draw (_tmp0_);
 #line 3418 "book-view.c"
 }
@@ -3422,17 +3422,17 @@ void book_view_select_next_page (BookView* self) {
 	PageView* _tmp0_ = NULL;
 	PageView* _tmp1_ = NULL;
 	PageView* _tmp2_ = NULL;
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 603 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->selected_page_view;
-#line 603 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = book_view_get_next_page (self, _tmp0_);
-#line 603 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = _tmp1_;
-#line 603 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_select_page_view (self, _tmp2_);
-#line 603 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (_tmp2_);
 #line 3438 "book-view.c"
 }
@@ -3442,17 +3442,17 @@ void book_view_select_prev_page (BookView* self) {
 	PageView* _tmp0_ = NULL;
 	PageView* _tmp1_ = NULL;
 	PageView* _tmp2_ = NULL;
-#line 606 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->selected_page_view;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = book_view_get_prev_page (self, _tmp0_);
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = _tmp1_;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_select_page_view (self, _tmp2_);
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (_tmp2_);
 #line 3458 "book-view.c"
 }
@@ -3461,20 +3461,20 @@ void book_view_select_prev_page (BookView* self) {
 Book* book_view_get_book (BookView* self) {
 	Book* result;
 	Book* _tmp0_ = NULL;
-#line 18 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 18 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->_book;
-#line 18 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = _tmp0_;
-#line 18 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 3473 "book-view.c"
 }
 
 
 static gpointer _book_ref0 (gpointer self) {
-#line 18 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self ? book_ref (self) : NULL;
 #line 3480 "book-view.c"
 }
@@ -3483,17 +3483,17 @@ static gpointer _book_ref0 (gpointer self) {
 static void book_view_set_book (BookView* self, Book* value) {
 	Book* _tmp0_ = NULL;
 	Book* _tmp1_ = NULL;
-#line 18 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 18 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = value;
-#line 18 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = _book_ref0 (_tmp0_);
-#line 18 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_book_unref0 (self->priv->_book);
-#line 18 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->_book = _tmp1_;
-#line 18 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_notify ((GObject *) self, "book");
 #line 3499 "book-view.c"
 }
@@ -3502,31 +3502,31 @@ static void book_view_set_book (BookView* self, Book* value) {
 Page* book_view_get_selected_page (BookView* self) {
 	Page* result;
 	PageView* _tmp0_ = NULL;
-#line 30 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 30 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 32 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->selected_page_view;
-#line 32 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp0_ != NULL) {
 #line 3512 "book-view.c"
 		PageView* _tmp1_ = NULL;
 		Page* _tmp2_ = NULL;
 		Page* _tmp3_ = NULL;
-#line 33 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp1_ = self->priv->selected_page_view;
-#line 33 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp2_ = page_view_get_page (_tmp1_);
-#line 33 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp3_ = _tmp2_;
-#line 33 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		result = _tmp3_;
-#line 33 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
 #line 3526 "book-view.c"
 	} else {
-#line 35 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 35 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		result = NULL;
-#line 35 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 35 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
 #line 3532 "book-view.c"
 	}
@@ -3538,43 +3538,43 @@ void book_view_set_selected_page (BookView* self, Page* value) {
 	Page* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
-#line 37 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 37 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = book_view_get_selected_page (self);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = _tmp0_;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = value;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp1_ == _tmp2_) {
-#line 40 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
 #line 3554 "book-view.c"
 	}
-#line 42 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = value;
-#line 42 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp3_ != NULL) {
 #line 3560 "book-view.c"
 		GHashTable* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
 		gconstpointer _tmp6_ = NULL;
-#line 43 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp4_ = self->priv->page_data;
-#line 43 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp5_ = value;
-#line 43 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp6_ = g_hash_table_lookup (_tmp4_, _tmp5_);
-#line 43 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_select_page_view (self, (PageView*) _tmp6_);
 #line 3572 "book-view.c"
 	} else {
-#line 45 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_select_page_view (self, NULL);
 #line 3576 "book-view.c"
 	}
-#line 37 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 37 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_notify ((GObject *) self, "selected-page");
 #line 3580 "book-view.c"
 }
@@ -3584,15 +3584,15 @@ gint book_view_get_x_offset (BookView* self) {
 	gint result;
 	GtkAdjustment* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 64 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 66 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->adjustment;
-#line 66 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 66 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = (gint) _tmp1_;
-#line 66 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 3598 "book-view.c"
 }
@@ -3601,15 +3601,15 @@ gint book_view_get_x_offset (BookView* self) {
 void book_view_set_x_offset (BookView* self, gint value) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 68 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
-#line 70 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->adjustment;
-#line 70 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = value;
-#line 70 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 68 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_notify ((GObject *) self, "x-offset");
 #line 3615 "book-view.c"
 }
@@ -3622,61 +3622,61 @@ static void g_cclosure_user_marshal_VOID__PAGE (GClosure * closure, GValue * ret
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (n_param_values == 2);
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		data1 = closure->data;
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		data2 = param_values->data[0].v_pointer;
 #line 3634 "book-view.c"
 	} else {
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		data2 = closure->data;
 #line 3640 "book-view.c"
 	}
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	callback = (GMarshalFunc_VOID__PAGE) (marshal_data ? marshal_data : cc->callback);
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	callback (data1, value_get_page (param_values + 1), data2);
 #line 3646 "book-view.c"
 }
 
 
 static void book_view_class_init (BookViewClass * klass) {
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_parent_class = g_type_class_peek_parent (klass);
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_type_class_add_private (klass, sizeof (BookViewPrivate));
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_book_view_get_property;
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_book_view_set_property;
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	G_OBJECT_CLASS (klass)->finalize = book_view_finalize;
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), BOOK_VIEW_BOOK, param_spec_book ("book", "book", "book", TYPE_BOOK, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), BOOK_VIEW_SELECTED_PAGE, param_spec_page ("selected-page", "selected-page", "selected-page", TYPE_PAGE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), BOOK_VIEW_X_OFFSET, g_param_spec_int ("x-offset", "x-offset", "x-offset", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_new ("page_selected", TYPE_BOOK_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PAGE, G_TYPE_NONE, 1, TYPE_PAGE);
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_new ("show_page", TYPE_BOOK_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PAGE, G_TYPE_NONE, 1, TYPE_PAGE);
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_new ("show_menu", TYPE_BOOK_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 3673 "book-view.c"
 }
 
 
 static void book_view_instance_init (BookView * self) {
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv = BOOK_VIEW_GET_PRIVATE (self);
-#line 27 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->selected_page_view = NULL;
 #line 3682 "book-view.c"
 }
@@ -3710,99 +3710,99 @@ static void book_view_finalize (GObject* obj) {
 	guint _tmp23_ = 0U;
 	GtkAdjustment* _tmp24_ = NULL;
 	guint _tmp25_ = 0U;
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BOOK_VIEW, BookView);
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp0_ = self->priv->_book;
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp1_, NULL, FALSE);
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _book_view_add_cb_book_page_added, self);
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = self->priv->_book;
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp3_, NULL, FALSE);
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _book_view_remove_cb_book_page_removed, self);
-#line 125 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp4_ = self->priv->_book;
-#line 125 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("reordered", TYPE_BOOK, &_tmp5_, NULL, FALSE);
-#line 125 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _book_view_reorder_cb_book_reordered, self);
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp6_ = self->priv->_book;
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("cleared", TYPE_BOOK, &_tmp7_, NULL, FALSE);
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _book_view_clear_cb_book_cleared, self);
-#line 127 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp8_ = self->priv->drawing_area;
-#line 127 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("configure-event", gtk_widget_get_type (), &_tmp9_, NULL, FALSE);
-#line 127 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _book_view_configure_cb_gtk_widget_configure_event, self);
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp10_ = self->priv->drawing_area;
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("draw", gtk_widget_get_type (), &_tmp11_, NULL, FALSE);
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _book_view_draw_cb_gtk_widget_draw, self);
-#line 129 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp12_ = self->priv->drawing_area;
-#line 129 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("motion-notify-event", gtk_widget_get_type (), &_tmp13_, NULL, FALSE);
-#line 129 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _book_view_motion_cb_gtk_widget_motion_notify_event, self);
-#line 130 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp14_ = self->priv->drawing_area;
-#line 130 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp15_, NULL, FALSE);
-#line 130 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _book_view_key_cb_gtk_widget_key_press_event, self);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp16_ = self->priv->drawing_area;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp17_, NULL, FALSE);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp16_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _book_view_button_cb_gtk_widget_button_press_event, self);
-#line 132 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp18_ = self->priv->drawing_area;
-#line 132 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("button-release-event", gtk_widget_get_type (), &_tmp19_, NULL, FALSE);
-#line 132 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp18_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp19_, 0, NULL, (GCallback) _book_view_button_cb_gtk_widget_button_release_event, self);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp20_ = self->priv->drawing_area;
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("focus-in-event", gtk_widget_get_type (), &_tmp21_, NULL, FALSE);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp20_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp21_, 0, NULL, (GCallback) _book_view_focus_cb_gtk_widget_focus_in_event, self);
-#line 134 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp22_ = self->priv->drawing_area;
-#line 134 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp23_, NULL, FALSE);
-#line 134 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp22_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp23_, 0, NULL, (GCallback) _book_view_focus_cb_gtk_widget_focus_out_event, self);
-#line 135 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp24_ = self->priv->adjustment;
-#line 135 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_parse_name ("value-changed", gtk_adjustment_get_type (), &_tmp25_, NULL, FALSE);
-#line 135 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _book_view_scroll_cb_gtk_adjustment_value_changed, self);
-#line 18 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_book_unref0 (self->priv->_book);
-#line 19 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_hash_table_unref0 (self->priv->page_data);
-#line 27 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (self->priv->selected_page_view);
-#line 50 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->drawing_area);
-#line 53 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 53 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->scroll);
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->adjustment);
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	G_OBJECT_CLASS (book_view_parent_class)->finalize (obj);
 #line 3808 "book-view.c"
 }
@@ -3823,31 +3823,31 @@ GType book_view_get_type (void) {
 static void _vala_book_view_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
 	BookView * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_BOOK_VIEW, BookView);
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	switch (property_id) {
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case BOOK_VIEW_BOOK:
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		value_set_book (value, book_view_get_book (self));
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		break;
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case BOOK_VIEW_SELECTED_PAGE:
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		value_set_page (value, book_view_get_selected_page (self));
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		break;
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case BOOK_VIEW_X_OFFSET:
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		g_value_set_int (value, book_view_get_x_offset (self));
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		break;
 #line 3847 "book-view.c"
 		default:
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		break;
 #line 3853 "book-view.c"
 	}
@@ -3857,31 +3857,31 @@ static void _vala_book_view_get_property (GObject * object, guint property_id, G
 static void _vala_book_view_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
 	BookView * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_BOOK_VIEW, BookView);
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	switch (property_id) {
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case BOOK_VIEW_BOOK:
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_set_book (self, value_get_book (value));
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		break;
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case BOOK_VIEW_SELECTED_PAGE:
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_set_selected_page (self, value_get_page (value));
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		break;
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case BOOK_VIEW_X_OFFSET:
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_set_x_offset (self, g_value_get_int (value));
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		break;
 #line 3881 "book-view.c"
 		default:
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 15 "/home/bob/bzr/simple-scan/3.16/src/book-view.vala"
+#line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		break;
 #line 3887 "book-view.c"
 	}
diff --git a/src/book.c b/src/book.c
index 5c805d5..d25c072 100644
--- a/src/book.c
+++ b/src/book.c
@@ -241,37 +241,37 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 
 
 static gpointer _page_ref0 (gpointer self) {
-#line 45 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self ? page_ref (self) : NULL;
 #line 247 "book.c"
 }
 
 
 static void _book_page_changed_cb_page_pixels_changed (Page* _sender, gpointer self) {
-#line 47 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_page_changed_cb ((Book*) self, _sender);
 #line 254 "book.c"
 }
 
 
 static void _book_page_changed_cb_page_crop_changed (Page* _sender, gpointer self) {
-#line 48 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_page_changed_cb ((Book*) self, _sender);
 #line 261 "book.c"
 }
 
 
 static void _page_unref0_ (gpointer var) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	(var == NULL) ? NULL : (var = (page_unref (var), NULL));
 #line 268 "book.c"
 }
 
 
 static void _g_list_free__page_unref0_ (GList* self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_list_foreach (self, (GFunc) _page_unref0_, NULL);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_list_free (self);
 #line 277 "book.c"
 }
@@ -279,20 +279,20 @@ static void _g_list_free__page_unref0_ (GList* self) {
 
 Book* book_construct (GType object_type) {
 	Book* self = NULL;
-#line 38 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = (Book*) g_type_create_instance (object_type);
-#line 40 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	__g_list_free__page_unref0_0 (self->priv->pages);
-#line 40 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = NULL;
-#line 38 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
 #line 291 "book.c"
 }
 
 
 Book* book_new (void) {
-#line 38 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return book_construct (TYPE_BOOK);
 #line 298 "book.c"
 }
@@ -300,24 +300,24 @@ Book* book_new (void) {
 
 void book_clear (Book* self) {
 	GList* _tmp0_ = NULL;
-#line 52 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 52 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
 #line 308 "book.c"
 	{
 		GList* page_collection = NULL;
 		GList* page_it = NULL;
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		page_collection = _tmp0_;
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		for (page_it = page_collection; page_it != NULL; page_it = page_it->next) {
 #line 316 "book.c"
 			Page* _tmp1_ = NULL;
 			Page* page = NULL;
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp1_ = _page_ref0 ((Page*) page_it->data);
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			page = _tmp1_;
 #line 323 "book.c"
 			{
@@ -325,40 +325,40 @@ void book_clear (Book* self) {
 				guint _tmp3_ = 0U;
 				Page* _tmp4_ = NULL;
 				guint _tmp5_ = 0U;
-#line 56 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp2_ = page;
-#line 56 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 56 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _book_page_changed_cb_page_pixels_changed, self);
-#line 57 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = page;
-#line 57 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp5_, NULL, FALSE);
-#line 57 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _book_page_changed_cb_page_crop_changed, self);
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
 #line 343 "book.c"
 			}
 		}
 	}
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	__g_list_free__page_unref0_0 (self->priv->pages);
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = NULL;
-#line 60 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 60 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "cleared");
 #line 353 "book.c"
 }
 
 
 static void book_page_changed_cb (Book* self, Page* page) {
-#line 63 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 63 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (page != NULL);
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
 #line 364 "book.c"
 }
@@ -370,29 +370,29 @@ void book_append_page (Book* self, Page* page) {
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 68 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 68 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (page != NULL);
-#line 70 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = page;
-#line 70 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 70 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_connect (_tmp0_, "pixels-changed", (GCallback) _book_page_changed_cb_page_pixels_changed, self);
-#line 71 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = page;
-#line 71 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_connect (_tmp1_, "crop-changed", (GCallback) _book_page_changed_cb_page_crop_changed, self);
-#line 73 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = page;
-#line 73 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 73 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = g_list_append (self->priv->pages, _tmp3_);
-#line 74 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = page;
-#line 74 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "page-added", _tmp4_);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
 #line 398 "book.c"
 }
@@ -403,25 +403,25 @@ void book_move_page (Book* self, Page* page, guint location) {
 	Page* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 78 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 78 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (page != NULL);
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = page;
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = g_list_remove (self->priv->pages, _tmp0_);
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = page;
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = _page_ref0 (_tmp1_);
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = location;
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = g_list_insert (self->priv->pages, _tmp2_, (gint) _tmp3_);
-#line 82 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "reordered");
-#line 83 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
 #line 427 "book.c"
 }
@@ -431,56 +431,56 @@ void book_reverse (Book* self) {
 	GList* new_pages = NULL;
 	GList* _tmp0_ = NULL;
 	GList* _tmp4_ = NULL;
-#line 86 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 88 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	new_pages = NULL;
-#line 89 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
 #line 441 "book.c"
 	{
 		GList* page_collection = NULL;
 		GList* page_it = NULL;
-#line 89 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		page_collection = _tmp0_;
-#line 89 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		for (page_it = page_collection; page_it != NULL; page_it = page_it->next) {
 #line 449 "book.c"
 			Page* _tmp1_ = NULL;
 			Page* page = NULL;
-#line 89 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp1_ = _page_ref0 ((Page*) page_it->data);
-#line 89 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			page = _tmp1_;
 #line 456 "book.c"
 			{
 				Page* _tmp2_ = NULL;
 				Page* _tmp3_ = NULL;
-#line 90 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp2_ = page;
-#line 90 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp3_ = _page_ref0 (_tmp2_);
-#line 90 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				new_pages = g_list_prepend (new_pages, _tmp3_);
-#line 89 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
 #line 468 "book.c"
 			}
 		}
 	}
-#line 91 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = new_pages;
-#line 91 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	new_pages = NULL;
-#line 91 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	__g_list_free__page_unref0_0 (self->priv->pages);
-#line 91 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = _tmp4_;
-#line 93 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "reordered");
-#line 94 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
-#line 86 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	__g_list_free__page_unref0_0 (new_pages);
 #line 486 "book.c"
 }
@@ -494,79 +494,79 @@ void book_combine_sides (Book* self) {
 	guint _tmp3_ = 0U;
 	GList* new_pages = NULL;
 	GList* _tmp19_ = NULL;
-#line 97 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 99 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = book_get_n_pages (self);
-#line 99 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _tmp0_;
-#line 99 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = book_get_n_pages (self);
-#line 99 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = _tmp2_;
-#line 99 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	n_front = _tmp1_ - (_tmp3_ / 2);
-#line 100 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	new_pages = NULL;
 #line 512 "book.c"
 	{
 		gint i = 0;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
 #line 517 "book.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp4_ = TRUE;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
 #line 524 "book.c"
 				gint _tmp6_ = 0;
 				guint _tmp7_ = 0U;
 				guint _tmp8_ = 0U;
 				gint _tmp9_ = 0;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!_tmp4_) {
 #line 531 "book.c"
 					gint _tmp5_ = 0;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp5_ = i;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					i = _tmp5_ + 1;
 #line 537 "book.c"
 				}
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = FALSE;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp6_ = i;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp7_ = book_get_n_pages (self);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp8_ = _tmp7_;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!(((guint) _tmp6_) < _tmp8_)) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
 #line 551 "book.c"
 				}
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp9_ = i;
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if ((_tmp9_ % 2) == 0) {
 #line 557 "book.c"
 					GList* _tmp10_ = NULL;
 					gint _tmp11_ = 0;
 					gconstpointer _tmp12_ = NULL;
 					Page* _tmp13_ = NULL;
-#line 104 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp10_ = self->priv->pages;
-#line 104 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp11_ = i;
-#line 104 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp12_ = g_list_nth_data (_tmp10_, (guint) (_tmp11_ / 2));
-#line 104 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp13_ = _page_ref0 ((Page*) _tmp12_);
-#line 104 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					new_pages = g_list_append (new_pages, _tmp13_);
 #line 572 "book.c"
 				} else {
@@ -575,36 +575,36 @@ void book_combine_sides (Book* self) {
 					gint _tmp16_ = 0;
 					gconstpointer _tmp17_ = NULL;
 					Page* _tmp18_ = NULL;
-#line 106 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp14_ = self->priv->pages;
-#line 106 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp15_ = n_front;
-#line 106 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp16_ = i;
-#line 106 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp17_ = g_list_nth_data (_tmp14_, _tmp15_ + (_tmp16_ / 2));
-#line 106 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp18_ = _page_ref0 ((Page*) _tmp17_);
-#line 106 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					new_pages = g_list_append (new_pages, _tmp18_);
 #line 591 "book.c"
 				}
 			}
 		}
 	}
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp19_ = new_pages;
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	new_pages = NULL;
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	__g_list_free__page_unref0_0 (self->priv->pages);
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = _tmp19_;
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "reordered");
-#line 111 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
-#line 97 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	__g_list_free__page_unref0_0 (new_pages);
 #line 610 "book.c"
 }
@@ -613,69 +613,69 @@ void book_combine_sides (Book* self) {
 void book_combine_sides_reverse (Book* self) {
 	GList* new_pages = NULL;
 	GList* _tmp16_ = NULL;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	new_pages = NULL;
 #line 621 "book.c"
 	{
 		gint i = 0;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
 #line 626 "book.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp0_ = TRUE;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
 #line 633 "book.c"
 				gint _tmp2_ = 0;
 				guint _tmp3_ = 0U;
 				guint _tmp4_ = 0U;
 				gint _tmp5_ = 0;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!_tmp0_) {
 #line 640 "book.c"
 					gint _tmp1_ = 0;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp1_ = i;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					i = _tmp1_ + 1;
 #line 646 "book.c"
 				}
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp0_ = FALSE;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp2_ = i;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp3_ = book_get_n_pages (self);
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = _tmp3_;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!(((guint) _tmp2_) < _tmp4_)) {
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
 #line 660 "book.c"
 				}
-#line 119 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp5_ = i;
-#line 119 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if ((_tmp5_ % 2) == 0) {
 #line 666 "book.c"
 					GList* _tmp6_ = NULL;
 					gint _tmp7_ = 0;
 					gconstpointer _tmp8_ = NULL;
 					Page* _tmp9_ = NULL;
-#line 120 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp6_ = self->priv->pages;
-#line 120 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp7_ = i;
-#line 120 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp8_ = g_list_nth_data (_tmp6_, (guint) (_tmp7_ / 2));
-#line 120 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp9_ = _page_ref0 ((Page*) _tmp8_);
-#line 120 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					new_pages = g_list_append (new_pages, _tmp9_);
 #line 681 "book.c"
 				} else {
@@ -685,38 +685,38 @@ void book_combine_sides_reverse (Book* self) {
 					gint _tmp13_ = 0;
 					gconstpointer _tmp14_ = NULL;
 					Page* _tmp15_ = NULL;
-#line 122 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp10_ = self->priv->pages;
-#line 122 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp11_ = book_get_n_pages (self);
-#line 122 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp12_ = _tmp11_;
-#line 122 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp13_ = i;
-#line 122 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp14_ = g_list_nth_data (_tmp10_, (_tmp12_ - 1) - (_tmp13_ / 2));
-#line 122 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp15_ = _page_ref0 ((Page*) _tmp14_);
-#line 122 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					new_pages = g_list_append (new_pages, _tmp15_);
 #line 703 "book.c"
 				}
 			}
 		}
 	}
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp16_ = new_pages;
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	new_pages = NULL;
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	__g_list_free__page_unref0_0 (self->priv->pages);
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = _tmp16_;
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "reordered");
-#line 127 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	__g_list_free__page_unref0_0 (new_pages);
 #line 722 "book.c"
 }
@@ -729,31 +729,31 @@ void book_delete_page (Book* self, Page* page) {
 	guint _tmp3_ = 0U;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 130 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 130 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (page != NULL);
-#line 132 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = page;
-#line 132 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 132 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _book_page_changed_cb_page_pixels_changed, self);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = page;
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _book_page_changed_cb_page_crop_changed, self);
-#line 134 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = page;
-#line 134 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->pages = g_list_remove (self->priv->pages, _tmp4_);
-#line 135 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = page;
-#line 135 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "page-removed", _tmp5_);
-#line 136 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
 #line 759 "book.c"
 }
@@ -766,37 +766,37 @@ Page* book_get_page (Book* self, gint page_number) {
 	gint _tmp5_ = 0;
 	gconstpointer _tmp6_ = NULL;
 	Page* _tmp7_ = NULL;
-#line 139 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = page_number;
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp0_ < 0) {
 #line 776 "book.c"
 		GList* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
 		gint _tmp3_ = 0;
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1_ = self->priv->pages;
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp2_ = g_list_length (_tmp1_);
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp3_ = page_number;
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		page_number = ((gint) _tmp2_) + _tmp3_;
 #line 788 "book.c"
 	}
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = self->priv->pages;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = page_number;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp6_ = g_list_nth_data (_tmp4_, (guint) _tmp5_);
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp7_ = _page_ref0 ((Page*) _tmp6_);
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp7_;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
 #line 802 "book.c"
 }
@@ -807,19 +807,19 @@ guint book_get_page_index (Book* self, Page* page) {
 	GList* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, 0U);
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (page != NULL, 0U);
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = page;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = g_list_index (_tmp0_, _tmp1_);
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = (guint) _tmp2_;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
 #line 825 "book.c"
 }
@@ -1026,54 +1026,54 @@ static GFile* book_make_indexed_file (Book* self, const gchar* uri, gint i) {
 	gchar* _tmp46_ = NULL;
 	const gchar* _tmp47_ = NULL;
 	GFile* _tmp48_ = NULL;
-#line 151 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 151 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (uri != NULL, NULL);
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = book_get_n_pages (self);
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _tmp0_;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp1_ == ((guint) 1)) {
 #line 1040 "book.c"
 		const gchar* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
-#line 154 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp2_ = uri;
-#line 154 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp3_ = g_file_new_for_uri (_tmp2_);
-#line 154 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		result = _tmp3_;
-#line 154 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return result;
 #line 1051 "book.c"
 	}
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = uri;
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = g_path_get_basename (_tmp4_);
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	basename = _tmp5_;
-#line 158 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp6_ = uri;
-#line 158 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 158 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	prefix = _tmp7_;
-#line 158 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp8_ = g_strdup ("");
-#line 158 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	suffix = _tmp8_;
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp9_ = basename;
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10_ = string_last_index_of_char (_tmp9_, (gunichar) '.', 0);
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	extension_index = _tmp10_;
-#line 160 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp11_ = extension_index;
-#line 160 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp11_ >= 0) {
 #line 1079 "book.c"
 		const gchar* _tmp12_ = NULL;
@@ -1090,117 +1090,117 @@ static GFile* book_make_indexed_file (Book* self, const gchar* uri, gint i) {
 		gint _tmp23_ = 0;
 		gint _tmp24_ = 0;
 		gchar* _tmp25_ = NULL;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp12_ = basename;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp13_ = extension_index;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp14_ = basename;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp15_ = strlen (_tmp14_);
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp16_ = _tmp15_;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp17_ = string_slice (_tmp12_, (glong) _tmp13_, (glong) _tmp16_);
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_free0 (suffix);
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		suffix = _tmp17_;
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp18_ = uri;
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp19_ = uri;
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp20_ = strlen (_tmp19_);
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp21_ = _tmp20_;
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp22_ = suffix;
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp23_ = strlen (_tmp22_);
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp24_ = _tmp23_;
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp25_ = string_slice (_tmp18_, (glong) 0, (glong) (_tmp21_ - _tmp24_));
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_free0 (prefix);
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		prefix = _tmp25_;
 #line 1130 "book.c"
 	}
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp26_ = book_get_n_pages (self);
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp27_ = _tmp26_;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp28_ = g_strdup_printf ("%u", _tmp27_);
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp29_ = _tmp28_;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp30_ = strlen (_tmp29_);
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp31_ = _tmp30_;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp32_ = _tmp31_;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp29_);
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	width = _tmp32_;
-#line 166 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp33_ = width;
-#line 166 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp34_ = g_strdup_printf ("%%0%dd", _tmp33_);
-#line 166 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	number_format = _tmp34_;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp35_ = prefix;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp36_ = g_strconcat (_tmp35_, "-", NULL);
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp37_ = _tmp36_;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp38_ = number_format;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp39_ = i;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp40_ = g_strdup_printf (_tmp38_, _tmp39_ + 1);
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp41_ = _tmp40_;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp42_ = g_strconcat (_tmp37_, _tmp41_, NULL);
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp43_ = _tmp42_;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp44_ = suffix;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp45_ = g_strconcat (_tmp43_, _tmp44_, NULL);
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp46_ = _tmp45_;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp43_);
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp41_);
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp37_);
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	filename = _tmp46_;
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp47_ = filename;
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp48_ = g_file_new_for_uri (_tmp47_);
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp48_;
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (filename);
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (number_format);
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (suffix);
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (prefix);
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (basename);
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
 #line 1206 "book.c"
 }
@@ -1208,23 +1208,23 @@ static GFile* book_make_indexed_file (Book* self, const gchar* uri, gint i) {
 
 static void book_save_multi_file (Book* self, const gchar* type, gint quality, GFile* file, GError** error) {
 	GError * _inner_error_ = NULL;
-#line 171 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 171 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (type != NULL);
-#line 171 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
 #line 1218 "book.c"
 	{
 		gint i = 0;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
 #line 1223 "book.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp0_ = TRUE;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
 #line 1230 "book.c"
 				gint _tmp2_ = 0;
@@ -1243,75 +1243,75 @@ static void book_save_multi_file (Book* self, const gchar* type, gint quality, G
 				GFile* _tmp14_ = NULL;
 				GFile* _tmp15_ = NULL;
 				gint _tmp16_ = 0;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!_tmp0_) {
 #line 1249 "book.c"
 					gint _tmp1_ = 0;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp1_ = i;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					i = _tmp1_ + 1;
 #line 1255 "book.c"
 				}
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp0_ = FALSE;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp2_ = i;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp3_ = book_get_n_pages (self);
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = _tmp3_;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!(((guint) _tmp2_) < _tmp4_)) {
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
 #line 1269 "book.c"
 				}
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp5_ = i;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp6_ = book_get_page (self, _tmp5_);
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				page = _tmp6_;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp7_ = page;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp8_ = type;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp9_ = quality;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp10_ = file;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp11_ = g_file_get_uri (_tmp10_);
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp12_ = _tmp11_;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp13_ = i;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp14_ = book_make_indexed_file (self, _tmp12_, _tmp13_);
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp15_ = _tmp14_;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				page_save (_tmp7_, _tmp8_, _tmp9_, _tmp15_, &_inner_error_);
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_object_unref0 (_tmp15_);
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp12_);
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_page_unref0 (page);
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
 #line 1309 "book.c"
 				}
-#line 177 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp16_ = i;
-#line 177 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_emit_by_name (self, "saving", _tmp16_);
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
 #line 1317 "book.c"
 			}
@@ -1328,42 +1328,42 @@ static void book_save_ps_pdf_surface (Book* self, cairo_surface_t* surface, GdkP
 	gdouble _tmp3_ = 0.0;
 	GdkPixbuf* _tmp4_ = NULL;
 	cairo_pattern_t* _tmp5_ = NULL;
-#line 181 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 181 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (surface != NULL);
-#line 181 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (image != NULL);
-#line 183 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = surface;
-#line 183 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = cairo_create (_tmp0_);
-#line 183 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	context = _tmp1_;
-#line 184 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = dpi;
-#line 184 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = dpi;
-#line 184 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	cairo_scale (context, 72.0 / _tmp2_, 72.0 / _tmp3_);
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = image;
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	gdk_cairo_set_source_pixbuf (context, _tmp4_, (gdouble) 0, (gdouble) 0);
-#line 186 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = cairo_get_source (context);
-#line 186 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	cairo_pattern_set_filter (_tmp5_, CAIRO_FILTER_BEST);
-#line 187 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	cairo_paint (context);
-#line 181 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_destroy0 (context);
 #line 1362 "book.c"
 }
 
 
 static gpointer _cairo_surface_reference0 (gpointer self) {
-#line 194 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self ? cairo_surface_reference (self) : NULL;
 #line 1369 "book.c"
 }
@@ -1380,47 +1380,47 @@ static void book_save_ps (Book* self, GFile* file, GError** error) {
 	cairo_surface_t* _tmp4_ = NULL;
 	cairo_surface_t* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 190 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 190 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
-#line 192 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = file;
-#line 192 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = g_file_replace (_tmp0_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_);
-#line 192 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream = _tmp1_;
-#line 192 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 192 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_propagate_error (error, _inner_error_);
-#line 192 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
 #line 1400 "book.c"
 	}
-#line 193 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = ps_writer_new (stream);
-#line 193 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	writer = _tmp2_;
-#line 194 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = writer;
-#line 194 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = _tmp3_->surface;
-#line 194 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = _cairo_surface_reference0 (_tmp4_);
-#line 194 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	surface = _tmp5_;
 #line 1414 "book.c"
 	{
 		gint i = 0;
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
 #line 1419 "book.c"
 		{
 			gboolean _tmp6_ = FALSE;
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp6_ = TRUE;
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
 #line 1426 "book.c"
 				gint _tmp8_ = 0;
@@ -1456,111 +1456,111 @@ static void book_save_ps (Book* self, GFile* file, GError** error) {
 				gint _tmp34_ = 0;
 				cairo_surface_t* _tmp35_ = NULL;
 				gint _tmp36_ = 0;
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!_tmp6_) {
 #line 1462 "book.c"
 					gint _tmp7_ = 0;
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp7_ = i;
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					i = _tmp7_ + 1;
 #line 1468 "book.c"
 				}
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp6_ = FALSE;
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp8_ = i;
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp9_ = book_get_n_pages (self);
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp10_ = _tmp9_;
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!(((guint) _tmp8_) < _tmp10_)) {
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
 #line 1482 "book.c"
 				}
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp11_ = i;
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp12_ = book_get_page (self, _tmp11_);
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				page = _tmp12_;
-#line 199 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp13_ = page;
-#line 199 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp14_ = page_get_image (_tmp13_, TRUE);
-#line 199 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				image = _tmp14_;
-#line 200 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp15_ = image;
-#line 200 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp16_ = gdk_pixbuf_get_width (_tmp15_);
-#line 200 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp17_ = _tmp16_;
-#line 200 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp18_ = page;
-#line 200 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp19_ = page_get_dpi (_tmp18_);
-#line 200 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp20_ = _tmp19_;
-#line 200 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				width = (_tmp17_ * 72.0) / _tmp20_;
-#line 201 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp21_ = image;
-#line 201 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp22_ = gdk_pixbuf_get_height (_tmp21_);
-#line 201 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp23_ = _tmp22_;
-#line 201 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp24_ = page;
-#line 201 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp25_ = page_get_dpi (_tmp24_);
-#line 201 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp26_ = _tmp25_;
-#line 201 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				height = (_tmp23_ * 72.0) / _tmp26_;
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp27_ = surface;
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp28_ = width;
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp29_ = height;
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				cairo_ps_surface_set_size (_tmp27_, _tmp28_, _tmp29_);
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp30_ = surface;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp31_ = image;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp32_ = page;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp33_ = page_get_dpi (_tmp32_);
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp34_ = _tmp33_;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_ps_pdf_surface (self, _tmp30_, _tmp31_, (gdouble) _tmp34_);
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp35_ = surface;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				cairo_surface_show_page (_tmp35_);
-#line 205 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp36_ = i;
-#line 205 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_emit_by_name (self, "saving", _tmp36_);
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_object_unref0 (image);
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
 #line 1556 "book.c"
 			}
 		}
 	}
-#line 190 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_surface_destroy0 (surface);
-#line 190 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_ps_writer_unref0 (writer);
-#line 190 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (stream);
 #line 1566 "book.c"
 }
@@ -1590,129 +1590,129 @@ static guint8* book_compress_zlib (Book* self, guint8* data, int data_length1, i
 	gint _tmp14_ = 0;
 	guint8* _tmp15_ = NULL;
 	gint _tmp15__length1 = 0;
-#line 209 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 211 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	deflateInit (&stream, (gint) Z_BEST_COMPRESSION);
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = data;
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0__length1 = data_length1;
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = g_new0 (guint8, _tmp0__length1);
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	out_data = _tmp1_;
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	out_data_length1 = _tmp0__length1;
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_out_data_size_ = out_data_length1;
-#line 214 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = data;
-#line 214 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2__length1 = data_length1;
-#line 214 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream.next_in = _tmp2_;
-#line 214 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream.avail_in = _tmp2__length1;
-#line 215 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = out_data;
-#line 215 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3__length1 = out_data_length1;
-#line 215 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream.next_out = _tmp3_;
-#line 215 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream.avail_out = _tmp3__length1;
-#line 216 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	while (TRUE) {
 #line 1628 "book.c"
 		z_stream _tmp4_ = {0};
 		guint _tmp5_ = 0U;
 		gint _tmp6_ = 0;
-#line 216 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp4_ = stream;
-#line 216 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp5_ = _tmp4_.avail_in;
-#line 216 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (!(_tmp5_ > ((guint) 0))) {
-#line 216 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			break;
 #line 1640 "book.c"
 		}
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp6_ = deflate (&stream, (gint) Z_FINISH);
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (_tmp6_ == ((gint) Z_STREAM_ERROR)) {
-#line 219 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			break;
 #line 1648 "book.c"
 		}
 	}
-#line 222 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp7_ = stream;
-#line 222 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp8_ = _tmp7_.avail_in;
-#line 222 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp8_ > ((guint) 0)) {
 #line 1657 "book.c"
 		guint8* _tmp9_ = NULL;
 		gint _tmp9__length1 = 0;
-#line 223 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp9_ = NULL;
-#line 223 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp9__length1 = 0;
-#line 223 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (result_length1) {
-#line 223 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			*result_length1 = _tmp9__length1;
 #line 1668 "book.c"
 		}
-#line 223 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		result = _tmp9_;
-#line 223 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		out_data = (g_free (out_data), NULL);
-#line 223 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		deflateEnd (&stream);
-#line 223 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return result;
 #line 1678 "book.c"
 	}
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10_ = data;
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10__length1 = data_length1;
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp11_ = stream;
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp12_ = _tmp11_.avail_out;
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	n_written = _tmp10__length1 - _tmp12_;
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_ = n_written;
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp14_ = (gint) _tmp13_;
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	out_data = g_renew (guint8, out_data, (gint) _tmp13_);
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	(_tmp14_ > out_data_length1) ? memset (out_data + out_data_length1, 0, sizeof (guint8) * (_tmp14_ - out_data_length1)) : NULL;
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	out_data_length1 = _tmp14_;
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_out_data_size_ = _tmp14_;
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15_ = out_data;
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15__length1 = out_data_length1;
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (result_length1) {
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*result_length1 = _tmp15__length1;
 #line 1710 "book.c"
 	}
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp15_;
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	deflateEnd (&stream);
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
 #line 1718 "book.c"
 }
@@ -1721,7 +1721,7 @@ static guint8* book_compress_zlib (Book* self, guint8* data, int data_length1, i
 static gboolean _book_write_pixbuf_data_gdk_pixbuf_save_func (guint8* buf, gsize buf_length1, GError** error, gpointer self) {
 	gboolean result;
 	result = book_write_pixbuf_data ((Book*) self, buf, buf_length1, error);
-#line 240 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
 #line 1727 "book.c"
 }
@@ -1758,82 +1758,82 @@ static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, g
 	guint8* _tmp17_ = NULL;
 	gint _tmp17__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 233 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 233 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (image != NULL, NULL);
-#line 235 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = g_byte_array_new ();
-#line 235 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_byte_array_unref0 (self->priv->jpeg_data);
-#line 235 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->jpeg_data = _tmp0_;
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = g_strdup ("quality");
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = g_strdup ("density-unit");
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = g_strdup ("x-density");
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = g_strdup ("y-density");
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = g_new0 (gchar*, 5 + 1);
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_[0] = _tmp1_;
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_[1] = _tmp2_;
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_[2] = _tmp3_;
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_[3] = _tmp4_;
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_[4] = NULL;
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	keys = _tmp5_;
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	keys_length1 = 5;
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_keys_size_ = keys_length1;
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp6_ = quality;
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp7_ = g_strdup_printf ("%d", _tmp6_);
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp8_ = g_strdup ("dots-per-inch");
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp9_ = dpi;
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10_ = g_strdup_printf ("%d", _tmp9_);
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp11_ = dpi;
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp12_ = g_strdup_printf ("%d", _tmp11_);
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_ = g_new0 (gchar*, 5 + 1);
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_[0] = _tmp7_;
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_[1] = _tmp8_;
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_[2] = _tmp10_;
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_[3] = _tmp12_;
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_[4] = NULL;
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	values = _tmp13_;
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	values_length1 = 5;
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_values_size_ = values_length1;
 #line 1830 "book.c"
 	{
 		GdkPixbuf* _tmp14_ = NULL;
-#line 240 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp14_ = image;
-#line 240 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		gdk_pixbuf_save_to_callbackv (_tmp14_, _book_write_pixbuf_data_gdk_pixbuf_save_func, self, "jpeg", keys, values, &_inner_error_);
-#line 240 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1839 "book.c"
 			goto __catch0_g_error;
@@ -1843,66 +1843,66 @@ static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, g
 	__catch0_g_error:
 	{
 		GError* e = NULL;
-#line 238 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		e = _inner_error_;
-#line 238 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_inner_error_ = NULL;
-#line 238 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_error_free0 (e);
 #line 1853 "book.c"
 	}
 	__finally0:
-#line 238 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 238 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 238 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 238 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 238 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_clear_error (&_inner_error_);
-#line 238 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return NULL;
 #line 1868 "book.c"
 	}
-#line 245 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15_ = self->priv->jpeg_data;
-#line 245 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp16_ = _tmp15_->data;
-#line 245 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp16__length1 = _tmp15_->len;
-#line 245 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15_->data = NULL;
-#line 245 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15_->len = 0;
-#line 245 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	data = _tmp16_;
-#line 245 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	data_length1 = _tmp16__length1;
-#line 245 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_data_size_ = data_length1;
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_byte_array_unref0 (self->priv->jpeg_data);
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->jpeg_data = NULL;
-#line 248 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp17_ = data;
-#line 248 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp17__length1 = data_length1;
-#line 248 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (result_length1) {
-#line 248 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*result_length1 = _tmp17__length1;
 #line 1898 "book.c"
 	}
-#line 248 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp17_;
-#line 248 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 248 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 248 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
 #line 1908 "book.c"
 }
@@ -1913,33 +1913,33 @@ static gboolean book_write_pixbuf_data (Book* self, guint8* buf, int buf_length1
 	GByteArray* _tmp0_ = NULL;
 	guint8* _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 251 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 253 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->jpeg_data;
-#line 253 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = buf;
-#line 253 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1__length1 = buf_length1;
-#line 253 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_byte_array_append (_tmp0_, _tmp1_, _tmp1__length1);
-#line 254 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = TRUE;
-#line 254 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
 #line 1931 "book.c"
 }
 
 
 static guint8* _vala_array_dup1 (guint8* self, int length) {
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return g_memdup (self, length * sizeof (guint8));
 #line 1938 "book.c"
 }
 
 
 static guint8* _vala_array_dup2 (guint8* self, int length) {
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return g_memdup (self, length * sizeof (guint8));
 #line 1945 "book.c"
 }
@@ -2047,25 +2047,25 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 	gchar* _tmp423_ = NULL;
 	PDFWriter* _tmp424_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 257 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 257 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
-#line 260 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = g_strdup ("");
-#line 260 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	id = _tmp0_;
 #line 2059 "book.c"
 	{
 		gint i = 0;
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
 #line 2064 "book.c"
 		{
 			gboolean _tmp1_ = FALSE;
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp1_ = TRUE;
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
 #line 2071 "book.c"
 				gint _tmp3_ = 0;
@@ -2074,165 +2074,165 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 				gchar* _tmp6_ = NULL;
 				gchar* _tmp7_ = NULL;
 				gchar* _tmp8_ = NULL;
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!_tmp1_) {
 #line 2080 "book.c"
 					gint _tmp2_ = 0;
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp2_ = i;
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					i = _tmp2_ + 1;
 #line 2086 "book.c"
 				}
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp1_ = FALSE;
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp3_ = i;
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!(_tmp3_ < 4)) {
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
 #line 2096 "book.c"
 				}
-#line 262 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = id;
-#line 262 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp5_ = g_random_int ();
-#line 262 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp6_ = g_strdup_printf ("%08x", (guint) _tmp5_);
-#line 262 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp7_ = _tmp6_;
-#line 262 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp8_ = g_strconcat (_tmp4_, _tmp7_, NULL);
-#line 262 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (id);
-#line 262 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				id = _tmp8_;
-#line 262 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp7_);
 #line 2114 "book.c"
 			}
 		}
 	}
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp9_ = file;
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10_ = g_file_replace (_tmp9_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_);
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream = _tmp10_;
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_propagate_error (error, _inner_error_);
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_free0 (id);
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
 #line 2132 "book.c"
 	}
-#line 265 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp11_ = pdf_writer_new (stream);
-#line 265 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	writer = _tmp11_;
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp12_ = writer;
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp12_, "%PDF-1.3\n");
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_ = writer;
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp13_, "%\xe2\xe3\xcf\xd3\n");
-#line 274 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp14_ = writer;
-#line 274 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15_ = pdf_writer_start_object (_tmp14_);
-#line 274 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	catalog_number = _tmp15_;
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp16_ = writer;
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp17_ = catalog_number;
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp18_ = g_strdup_printf ("%u 0 obj\n", _tmp17_);
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp19_ = _tmp18_;
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp16_, _tmp19_);
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp19_);
-#line 276 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp20_ = writer;
-#line 276 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp20_, "<<\n");
-#line 277 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp21_ = writer;
-#line 277 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp21_, "/Type /Catalog\n");
-#line 280 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp22_ = writer;
-#line 280 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp23_ = catalog_number;
-#line 280 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp24_ = g_strdup_printf ("/Pages %u 0 R\n", _tmp23_ + 1);
-#line 280 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp25_ = _tmp24_;
-#line 280 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp22_, _tmp25_);
-#line 280 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp25_);
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp26_ = writer;
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp26_, ">>\n");
-#line 282 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp27_ = writer;
-#line 282 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp27_, "endobj\n");
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp28_ = writer;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp28_, "\n");
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp29_ = writer;
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp30_ = pdf_writer_start_object (_tmp29_);
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pages_number = _tmp30_;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp31_ = writer;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp32_ = pages_number;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp33_ = g_strdup_printf ("%u 0 obj\n", _tmp32_);
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp34_ = _tmp33_;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp31_, _tmp34_);
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp34_);
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp35_ = writer;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp35_, "<<\n");
-#line 304 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp36_ = writer;
-#line 304 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp36_, "/Type /Pages\n");
-#line 305 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp37_ = writer;
-#line 305 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp37_, "/Kids [");
 #line 2226 "book.c"
 	{
 		gint i = 0;
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
 #line 2231 "book.c"
 		{
 			gboolean _tmp38_ = FALSE;
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp38_ = TRUE;
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
 #line 2238 "book.c"
 				gint _tmp40_ = 0;
@@ -2243,85 +2243,85 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 				gint _tmp45_ = 0;
 				gchar* _tmp46_ = NULL;
 				gchar* _tmp47_ = NULL;
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!_tmp38_) {
 #line 2249 "book.c"
 					gint _tmp39_ = 0;
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp39_ = i;
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					i = _tmp39_ + 1;
 #line 2255 "book.c"
 				}
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp38_ = FALSE;
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp40_ = i;
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp41_ = book_get_n_pages (self);
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp42_ = _tmp41_;
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!(((guint) _tmp40_) < _tmp42_)) {
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
 #line 2269 "book.c"
 				}
-#line 307 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp43_ = writer;
-#line 307 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp44_ = pages_number;
-#line 307 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp45_ = i;
-#line 307 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp46_ = g_strdup_printf (" %u 0 R", (_tmp44_ + 1) + (_tmp45_ * 3));
-#line 307 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp47_ = _tmp46_;
-#line 307 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp43_, _tmp47_);
-#line 307 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp47_);
 #line 2285 "book.c"
 			}
 		}
 	}
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp48_ = writer;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp48_, " ]\n");
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp49_ = writer;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp50_ = book_get_n_pages (self);
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp51_ = _tmp50_;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp52_ = g_strdup_printf ("/Count %u\n", _tmp51_);
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp53_ = _tmp52_;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp49_, _tmp53_);
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp53_);
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp54_ = writer;
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp54_, ">>\n");
-#line 311 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp55_ = writer;
-#line 311 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp55_, "endobj\n");
 #line 2315 "book.c"
 	{
 		gint i = 0;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
 #line 2320 "book.c"
 		{
 			gboolean _tmp56_ = FALSE;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp56_ = TRUE;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
 #line 2327 "book.c"
 				gint _tmp58_ = 0;
@@ -2492,119 +2492,119 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 				PDFWriter* _tmp363_ = NULL;
 				PDFWriter* _tmp364_ = NULL;
 				gint _tmp365_ = 0;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!_tmp56_) {
 #line 2498 "book.c"
 					gint _tmp57_ = 0;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp57_ = i;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					i = _tmp57_ + 1;
 #line 2504 "book.c"
 				}
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp56_ = FALSE;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp58_ = i;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp59_ = book_get_n_pages (self);
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp60_ = _tmp59_;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (!(((guint) _tmp58_) < _tmp60_)) {
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
 #line 2518 "book.c"
 				}
-#line 315 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp61_ = i;
-#line 315 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp62_ = book_get_page (self, _tmp61_);
-#line 315 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				page = _tmp62_;
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp63_ = page;
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp64_ = page_get_image (_tmp63_, TRUE);
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				image = _tmp64_;
-#line 317 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp65_ = image;
-#line 317 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp66_ = gdk_pixbuf_get_width (_tmp65_);
-#line 317 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp67_ = _tmp66_;
-#line 317 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				width = _tmp67_;
-#line 318 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp68_ = image;
-#line 318 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp69_ = gdk_pixbuf_get_height (_tmp68_);
-#line 318 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp70_ = _tmp69_;
-#line 318 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				height = _tmp70_;
-#line 319 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp71_ = image;
-#line 319 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp72_ = gdk_pixbuf_get_pixels (_tmp71_);
-#line 319 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pixels = _tmp72_;
-#line 319 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pixels_length1 = -1;
-#line 319 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_pixels_size_ = pixels_length1;
-#line 320 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp73_ = width;
-#line 320 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp74_ = page;
-#line 320 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp75_ = page_get_dpi (_tmp74_);
-#line 320 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp76_ = _tmp75_;
-#line 320 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				page_width = (_tmp73_ * 72.0) / _tmp76_;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp77_ = height;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp78_ = page;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp79_ = page_get_dpi (_tmp78_);
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp80_ = _tmp79_;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				page_height = (_tmp77_ * 72.0) / _tmp80_;
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				depth = 8;
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp81_ = g_strdup ("DeviceRGB");
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				color_space = _tmp81_;
-#line 325 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				filter = NULL;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp82_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				width_buffer = _tmp82_;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				width_buffer_length1 = G_ASCII_DTOSTR_BUF_SIZE;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_width_buffer_size_ = width_buffer_length1;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp83_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				height_buffer = _tmp83_;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				height_buffer_length1 = G_ASCII_DTOSTR_BUF_SIZE;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_height_buffer_size_ = height_buffer_length1;
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp84_ = page;
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp85_ = page_get_is_color (_tmp84_);
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp86_ = _tmp85_;
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (_tmp86_) {
 #line 2610 "book.c"
 					gchar* _tmp87_ = NULL;
@@ -2613,43 +2613,43 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 					gint _tmp89_ = 0;
 					gint _tmp90_ = 0;
 					guint8* _tmp91_ = NULL;
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					depth = 8;
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp87_ = g_strdup ("DeviceRGB");
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_g_free0 (color_space);
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					color_space = _tmp87_;
-#line 333 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp88_ = height;
-#line 333 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp89_ = width;
-#line 333 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					data_length = (_tmp88_ * _tmp89_) * 3;
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp90_ = data_length;
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp91_ = g_new0 (guint8, _tmp90_);
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					data = (g_free (data), NULL);
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					data = _tmp91_;
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					data_length1 = _tmp90_;
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_data_size_ = data_length1;
 #line 2643 "book.c"
 					{
 						gint row = 0;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						row = 0;
 #line 2648 "book.c"
 						{
 							gboolean _tmp92_ = FALSE;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp92_ = TRUE;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							while (TRUE) {
 #line 2655 "book.c"
 								gint _tmp94_ = 0;
@@ -2662,55 +2662,55 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 								gint out_offset = 0;
 								gint _tmp100_ = 0;
 								gint _tmp101_ = 0;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								if (!_tmp92_) {
 #line 2668 "book.c"
 									gint _tmp93_ = 0;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp93_ = row;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									row = _tmp93_ + 1;
 #line 2674 "book.c"
 								}
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp92_ = FALSE;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp94_ = row;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp95_ = height;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								if (!(_tmp94_ < _tmp95_)) {
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									break;
 #line 2686 "book.c"
 								}
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp96_ = row;
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp97_ = image;
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp98_ = gdk_pixbuf_get_rowstride (_tmp97_);
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp99_ = _tmp98_;
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								in_offset = _tmp96_ * _tmp99_;
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp100_ = row;
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp101_ = width;
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								out_offset = (_tmp100_ * _tmp101_) * 3;
 #line 2704 "book.c"
 								{
 									gint x = 0;
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									x = 0;
 #line 2709 "book.c"
 									{
 										gboolean _tmp102_ = FALSE;
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp102_ = TRUE;
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										while (TRUE) {
 #line 2716 "book.c"
 											gint _tmp104_ = 0;
@@ -2745,93 +2745,93 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 											gint _tmp125_ = 0;
 											guint8 _tmp126_ = 0U;
 											guint8 _tmp127_ = 0U;
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											if (!_tmp102_) {
 #line 2751 "book.c"
 												gint _tmp103_ = 0;
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp103_ = x;
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												x = _tmp103_ + 1;
 #line 2757 "book.c"
 											}
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp102_ = FALSE;
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp104_ = x;
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp105_ = width;
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											if (!(_tmp104_ < _tmp105_)) {
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												break;
 #line 2769 "book.c"
 											}
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp106_ = in_offset;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp107_ = x;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											in_o = _tmp106_ + (_tmp107_ * 3);
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp108_ = out_offset;
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp109_ = x;
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											out_o = _tmp108_ + (_tmp109_ * 3);
-#line 344 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp110_ = data;
-#line 344 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp110__length1 = data_length1;
-#line 344 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp111_ = out_o;
-#line 344 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp112_ = pixels;
-#line 344 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp112__length1 = pixels_length1;
-#line 344 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp113_ = in_o;
-#line 344 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp114_ = _tmp112_[_tmp113_];
-#line 344 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp110_[_tmp111_] = _tmp114_;
-#line 344 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp115_ = _tmp110_[_tmp111_];
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp116_ = data;
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp116__length1 = data_length1;
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp117_ = out_o;
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp118_ = pixels;
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp118__length1 = pixels_length1;
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp119_ = in_o;
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp120_ = _tmp118_[_tmp119_ + 1];
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp116_[_tmp117_ + 1] = _tmp120_;
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp121_ = _tmp116_[_tmp117_ + 1];
-#line 346 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp122_ = data;
-#line 346 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp122__length1 = data_length1;
-#line 346 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp123_ = out_o;
-#line 346 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp124_ = pixels;
-#line 346 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp124__length1 = pixels_length1;
-#line 346 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp125_ = in_o;
-#line 346 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp126_ = _tmp124_[_tmp125_ + 2];
-#line 346 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp122_[_tmp123_ + 2] = _tmp126_;
-#line 346 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp127_ = _tmp122_[_tmp123_ + 2];
 #line 2837 "book.c"
 										}
@@ -2844,13 +2844,13 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 					Page* _tmp128_ = NULL;
 					gint _tmp129_ = 0;
 					gint _tmp130_ = 0;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp128_ = page;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp129_ = page_get_depth (_tmp128_);
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp130_ = _tmp129_;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					if (_tmp130_ == 2) {
 #line 2856 "book.c"
 						gint shift_count = 0;
@@ -2861,47 +2861,47 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 						gint _tmp134_ = 0;
 						guint8* _tmp135_ = NULL;
 						gint offset = 0;
-#line 352 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						shift_count = 6;
-#line 353 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						depth = 2;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp131_ = g_strdup ("DeviceGray");
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_g_free0 (color_space);
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						color_space = _tmp131_;
-#line 355 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp132_ = height;
-#line 355 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp133_ = width;
-#line 355 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						data_length = _tmp132_ * (((_tmp133_ * 2) + 7) / 8);
-#line 356 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp134_ = data_length;
-#line 356 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp135_ = g_new0 (guint8, _tmp134_);
-#line 356 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						data = (g_free (data), NULL);
-#line 356 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						data = _tmp135_;
-#line 356 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						data_length1 = _tmp134_;
-#line 356 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_data_size_ = data_length1;
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						offset = 0;
 #line 2895 "book.c"
 						{
 							gint row = 0;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							row = 0;
 #line 2900 "book.c"
 							{
 								gboolean _tmp136_ = FALSE;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								_tmp136_ = TRUE;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								while (TRUE) {
 #line 2907 "book.c"
 									gint _tmp138_ = 0;
@@ -2912,63 +2912,63 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 									GdkPixbuf* _tmp143_ = NULL;
 									gint _tmp144_ = 0;
 									gint _tmp145_ = 0;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									if (!_tmp136_) {
 #line 2918 "book.c"
 										gint _tmp137_ = 0;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp137_ = row;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										row = _tmp137_ + 1;
 #line 2924 "book.c"
 									}
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp136_ = FALSE;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp138_ = row;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp139_ = height;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									if (!(_tmp138_ < _tmp139_)) {
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										break;
 #line 2936 "book.c"
 									}
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp140_ = shift_count;
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									if (_tmp140_ != 6) {
 #line 2942 "book.c"
 										gint _tmp141_ = 0;
-#line 363 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp141_ = offset;
-#line 363 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										offset = _tmp141_ + 1;
-#line 364 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										shift_count = 6;
 #line 2950 "book.c"
 									}
-#line 367 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp142_ = row;
-#line 367 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp143_ = image;
-#line 367 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp144_ = gdk_pixbuf_get_rowstride (_tmp143_);
-#line 367 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp145_ = _tmp144_;
-#line 367 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									in_offset = _tmp142_ * _tmp145_;
 #line 2962 "book.c"
 									{
 										gint x = 0;
-#line 368 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										x = 0;
 #line 2967 "book.c"
 										{
 											gboolean _tmp146_ = FALSE;
-#line 368 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp146_ = TRUE;
-#line 368 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											while (TRUE) {
 #line 2974 "book.c"
 												gint _tmp148_ = 0;
@@ -2982,64 +2982,64 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 												guint8 _tmp157_ = 0U;
 												guint8 _tmp158_ = 0U;
 												gint _tmp173_ = 0;
-#line 368 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												if (!_tmp146_) {
 #line 2988 "book.c"
 													gint _tmp147_ = 0;
-#line 368 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp147_ = x;
-#line 368 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													x = _tmp147_ + 1;
 #line 2994 "book.c"
 												}
-#line 368 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp146_ = FALSE;
-#line 368 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp148_ = x;
-#line 368 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp149_ = width;
-#line 368 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												if (!(_tmp148_ < _tmp149_)) {
-#line 368 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													break;
 #line 3006 "book.c"
 												}
-#line 371 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp150_ = shift_count;
-#line 371 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												if (_tmp150_ == 6) {
 #line 3012 "book.c"
 													guint8* _tmp151_ = NULL;
 													gint _tmp151__length1 = 0;
 													gint _tmp152_ = 0;
 													guint8 _tmp153_ = 0U;
-#line 372 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp151_ = data;
-#line 372 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp151__length1 = data_length1;
-#line 372 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp152_ = offset;
-#line 372 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp151_[_tmp152_] = (guint8) 0;
-#line 372 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp153_ = _tmp151_[_tmp152_];
 #line 3027 "book.c"
 												}
-#line 375 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp154_ = pixels;
-#line 375 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp154__length1 = pixels_length1;
-#line 375 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp155_ = in_offset;
-#line 375 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp156_ = x;
-#line 375 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp157_ = _tmp154_[_tmp155_ + (_tmp156_ * 3)];
-#line 375 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												p = _tmp157_;
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp158_ = p;
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												if (((gint) _tmp158_) >= 192) {
 #line 3045 "book.c"
 													guint8* _tmp159_ = NULL;
@@ -3047,24 +3047,24 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 													gint _tmp160_ = 0;
 													gint _tmp161_ = 0;
 													guint8 _tmp162_ = 0U;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp159_ = data;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp159__length1 = data_length1;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp160_ = offset;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp161_ = shift_count;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp159_[_tmp160_] |= (guint8) (3 << _tmp161_);
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp162_ = _tmp159_[_tmp160_];
 #line 3063 "book.c"
 												} else {
 													guint8 _tmp163_ = 0U;
-#line 378 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp163_ = p;
-#line 378 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													if (((gint) _tmp163_) >= 128) {
 #line 3070 "book.c"
 														guint8* _tmp164_ = NULL;
@@ -3072,24 +3072,24 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 														gint _tmp165_ = 0;
 														gint _tmp166_ = 0;
 														guint8 _tmp167_ = 0U;
-#line 379 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp164_ = data;
-#line 379 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp164__length1 = data_length1;
-#line 379 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp165_ = offset;
-#line 379 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp166_ = shift_count;
-#line 379 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp164_[_tmp165_] |= (guint8) (2 << _tmp166_);
-#line 379 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp167_ = _tmp164_[_tmp165_];
 #line 3088 "book.c"
 													} else {
 														guint8 _tmp168_ = 0U;
-#line 380 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp168_ = p;
-#line 380 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														if (((gint) _tmp168_) >= 64) {
 #line 3095 "book.c"
 															guint8* _tmp169_ = NULL;
@@ -3097,40 +3097,40 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 															gint _tmp170_ = 0;
 															gint _tmp171_ = 0;
 															guint8 _tmp172_ = 0U;
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 															_tmp169_ = data;
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 															_tmp169__length1 = data_length1;
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 															_tmp170_ = offset;
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 															_tmp171_ = shift_count;
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 															_tmp169_[_tmp170_] |= (guint8) (1 << _tmp171_);
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 															_tmp172_ = _tmp169_[_tmp170_];
 #line 3113 "book.c"
 														}
 													}
 												}
-#line 384 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp173_ = shift_count;
-#line 384 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												if (_tmp173_ == 0) {
 #line 3121 "book.c"
 													gint _tmp174_ = 0;
-#line 386 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp174_ = offset;
-#line 386 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													offset = _tmp174_ + 1;
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													shift_count = 6;
 #line 3129 "book.c"
 												} else {
 													gint _tmp175_ = 0;
-#line 390 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp175_ = shift_count;
-#line 390 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													shift_count = _tmp175_ - 2;
 #line 3136 "book.c"
 												}
@@ -3144,13 +3144,13 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 						Page* _tmp176_ = NULL;
 						gint _tmp177_ = 0;
 						gint _tmp178_ = 0;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp176_ = page;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp177_ = page_get_depth (_tmp176_);
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp178_ = _tmp177_;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						if (_tmp178_ == 1) {
 #line 3156 "book.c"
 							gint mask = 0;
@@ -3161,47 +3161,47 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 							gint _tmp182_ = 0;
 							guint8* _tmp183_ = NULL;
 							gint offset = 0;
-#line 396 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							mask = 0x80;
-#line 398 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							depth = 1;
-#line 399 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp179_ = g_strdup ("DeviceGray");
-#line 399 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_g_free0 (color_space);
-#line 399 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							color_space = _tmp179_;
-#line 400 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp180_ = height;
-#line 400 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp181_ = width;
-#line 400 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data_length = _tmp180_ * ((_tmp181_ + 7) / 8);
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp182_ = data_length;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp183_ = g_new0 (guint8, _tmp182_);
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data = (g_free (data), NULL);
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data = _tmp183_;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data_length1 = _tmp182_;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_data_size_ = data_length1;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							offset = 0;
 #line 3195 "book.c"
 							{
 								gint row = 0;
-#line 403 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								row = 0;
 #line 3200 "book.c"
 								{
 									gboolean _tmp184_ = FALSE;
-#line 403 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp184_ = TRUE;
-#line 403 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									while (TRUE) {
 #line 3207 "book.c"
 										gint _tmp186_ = 0;
@@ -3212,63 +3212,63 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 										GdkPixbuf* _tmp191_ = NULL;
 										gint _tmp192_ = 0;
 										gint _tmp193_ = 0;
-#line 403 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										if (!_tmp184_) {
 #line 3218 "book.c"
 											gint _tmp185_ = 0;
-#line 403 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp185_ = row;
-#line 403 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											row = _tmp185_ + 1;
 #line 3224 "book.c"
 										}
-#line 403 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp184_ = FALSE;
-#line 403 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp186_ = row;
-#line 403 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp187_ = height;
-#line 403 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										if (!(_tmp186_ < _tmp187_)) {
-#line 403 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											break;
 #line 3236 "book.c"
 										}
-#line 406 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp188_ = mask;
-#line 406 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										if (_tmp188_ != 0x80) {
 #line 3242 "book.c"
 											gint _tmp189_ = 0;
-#line 408 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp189_ = offset;
-#line 408 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											offset = _tmp189_ + 1;
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											mask = 0x80;
 #line 3250 "book.c"
 										}
-#line 412 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp190_ = row;
-#line 412 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp191_ = image;
-#line 412 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp192_ = gdk_pixbuf_get_rowstride (_tmp191_);
-#line 412 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp193_ = _tmp192_;
-#line 412 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										in_offset = _tmp190_ * _tmp193_;
 #line 3262 "book.c"
 										{
 											gint x = 0;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											x = 0;
 #line 3267 "book.c"
 											{
 												gboolean _tmp194_ = FALSE;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp194_ = TRUE;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												while (TRUE) {
 #line 3274 "book.c"
 													gint _tmp196_ = 0;
@@ -3281,60 +3281,60 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 													guint8 _tmp205_ = 0U;
 													gint _tmp210_ = 0;
 													gint _tmp211_ = 0;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													if (!_tmp194_) {
 #line 3287 "book.c"
 														gint _tmp195_ = 0;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp195_ = x;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														x = _tmp195_ + 1;
 #line 3293 "book.c"
 													}
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp194_ = FALSE;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp196_ = x;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp197_ = width;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													if (!(_tmp196_ < _tmp197_)) {
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														break;
 #line 3305 "book.c"
 													}
-#line 416 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp198_ = mask;
-#line 416 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													if (_tmp198_ == 0x80) {
 #line 3311 "book.c"
 														guint8* _tmp199_ = NULL;
 														gint _tmp199__length1 = 0;
 														gint _tmp200_ = 0;
 														guint8 _tmp201_ = 0U;
-#line 417 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp199_ = data;
-#line 417 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp199__length1 = data_length1;
-#line 417 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp200_ = offset;
-#line 417 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp199_[_tmp200_] = (guint8) 0;
-#line 417 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp201_ = _tmp199_[_tmp200_];
 #line 3326 "book.c"
 													}
-#line 420 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp202_ = pixels;
-#line 420 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp202__length1 = pixels_length1;
-#line 420 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp203_ = in_offset;
-#line 420 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp204_ = x;
-#line 420 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp205_ = _tmp202_[_tmp203_ + (_tmp204_ * 3)];
-#line 420 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													if (((gint) _tmp205_) != 0) {
 #line 3340 "book.c"
 														guint8* _tmp206_ = NULL;
@@ -3342,35 +3342,35 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 														gint _tmp207_ = 0;
 														gint _tmp208_ = 0;
 														guint8 _tmp209_ = 0U;
-#line 421 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp206_ = data;
-#line 421 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp206__length1 = data_length1;
-#line 421 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp207_ = offset;
-#line 421 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp208_ = mask;
-#line 421 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp206_[_tmp207_] |= (guint8) _tmp208_;
-#line 421 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp209_ = _tmp206_[_tmp207_];
 #line 3358 "book.c"
 													}
-#line 424 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp210_ = mask;
-#line 424 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													mask = _tmp210_ >> 1;
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp211_ = mask;
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													if (_tmp211_ == 0) {
 #line 3368 "book.c"
 														gint _tmp212_ = 0;
-#line 427 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp212_ = offset;
-#line 427 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														offset = _tmp212_ + 1;
-#line 428 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														mask = 0x80;
 #line 3376 "book.c"
 													}
@@ -3387,43 +3387,43 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 							gint _tmp215_ = 0;
 							gint _tmp216_ = 0;
 							guint8* _tmp217_ = NULL;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							depth = 8;
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp213_ = g_strdup ("DeviceGray");
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_g_free0 (color_space);
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							color_space = _tmp213_;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp214_ = height;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp215_ = width;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data_length = _tmp214_ * _tmp215_;
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp216_ = data_length;
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp217_ = g_new0 (guint8, _tmp216_);
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data = (g_free (data), NULL);
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data = _tmp217_;
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data_length1 = _tmp216_;
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_data_size_ = data_length1;
 #line 3417 "book.c"
 							{
 								gint row = 0;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								row = 0;
 #line 3422 "book.c"
 								{
 									gboolean _tmp218_ = FALSE;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									_tmp218_ = TRUE;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									while (TRUE) {
 #line 3429 "book.c"
 										gint _tmp220_ = 0;
@@ -3436,55 +3436,55 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 										gint out_offset = 0;
 										gint _tmp226_ = 0;
 										gint _tmp227_ = 0;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										if (!_tmp218_) {
 #line 3442 "book.c"
 											gint _tmp219_ = 0;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											_tmp219_ = row;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											row = _tmp219_ + 1;
 #line 3448 "book.c"
 										}
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp218_ = FALSE;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp220_ = row;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp221_ = height;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										if (!(_tmp220_ < _tmp221_)) {
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											break;
 #line 3460 "book.c"
 										}
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp222_ = row;
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp223_ = image;
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp224_ = gdk_pixbuf_get_rowstride (_tmp223_);
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp225_ = _tmp224_;
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										in_offset = _tmp222_ * _tmp225_;
-#line 442 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp226_ = row;
-#line 442 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp227_ = width;
-#line 442 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										out_offset = _tmp226_ * _tmp227_;
 #line 3478 "book.c"
 										{
 											gint x = 0;
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											x = 0;
 #line 3483 "book.c"
 											{
 												gboolean _tmp228_ = FALSE;
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												_tmp228_ = TRUE;
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												while (TRUE) {
 #line 3490 "book.c"
 													gint _tmp230_ = 0;
@@ -3499,49 +3499,49 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 													gint _tmp237_ = 0;
 													guint8 _tmp238_ = 0U;
 													guint8 _tmp239_ = 0U;
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													if (!_tmp228_) {
 #line 3505 "book.c"
 														gint _tmp229_ = 0;
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														_tmp229_ = x;
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														x = _tmp229_ + 1;
 #line 3511 "book.c"
 													}
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp228_ = FALSE;
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp230_ = x;
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp231_ = width;
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													if (!(_tmp230_ < _tmp231_)) {
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														break;
 #line 3523 "book.c"
 													}
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp232_ = data;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp232__length1 = data_length1;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp233_ = out_offset;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp234_ = x;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp235_ = pixels;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp235__length1 = pixels_length1;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp236_ = in_offset;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp237_ = x;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp238_ = _tmp235_[_tmp236_ + (_tmp237_ * 3)];
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp232_[_tmp233_ + _tmp234_] = _tmp238_;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													_tmp239_ = _tmp232_[_tmp233_ + _tmp234_];
 #line 3547 "book.c"
 												}
@@ -3553,30 +3553,30 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 						}
 					}
 				}
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp240_ = data;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp240__length1 = data_length1;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp242_ = book_compress_zlib (self, _tmp240_, _tmp240__length1, &_tmp241_);
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				compressed_data = _tmp242_;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				compressed_data_length1 = _tmp241_;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_compressed_data_size_ = compressed_data_length1;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp243_ = compressed_data;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp243__length1 = compressed_data_length1;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (_tmp243_ != NULL) {
 #line 3575 "book.c"
 					gint _tmp244_ = 0;
 					const gchar* _tmp257_ = NULL;
-#line 453 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp244_ = depth;
-#line 453 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					if (_tmp244_ > 1) {
 #line 3582 "book.c"
 						guint8* jpeg_data = NULL;
@@ -3593,33 +3593,33 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 						gint _tmp252__length1 = 0;
 						guint8* _tmp253_ = NULL;
 						gint _tmp253__length1 = 0;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp245_ = image;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp246_ = quality;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp247_ = page;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp248_ = page_get_dpi (_tmp247_);
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp249_ = _tmp248_;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp251_ = book_compress_jpeg (self, _tmp245_, _tmp246_, _tmp249_, &_tmp250_);
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						jpeg_data = _tmp251_;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						jpeg_data_length1 = _tmp250_;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_jpeg_data_size_ = jpeg_data_length1;
-#line 456 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp252_ = jpeg_data;
-#line 456 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp252__length1 = jpeg_data_length1;
-#line 456 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp253_ = compressed_data;
-#line 456 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp253__length1 = compressed_data_length1;
-#line 456 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						if (_tmp252__length1 < _tmp253__length1) {
 #line 3625 "book.c"
 							gchar* _tmp254_ = NULL;
@@ -3627,37 +3627,37 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 							gint _tmp255__length1 = 0;
 							guint8* _tmp256_ = NULL;
 							gint _tmp256__length1 = 0;
-#line 458 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp254_ = g_strdup ("DCTDecode");
-#line 458 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_g_free0 (filter);
-#line 458 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							filter = _tmp254_;
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp255_ = jpeg_data;
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp255__length1 = jpeg_data_length1;
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp256_ = (_tmp255_ != NULL) ? _vala_array_dup1 (_tmp255_, _tmp255__length1) : ((gpointer) _tmp255_);
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_tmp256__length1 = _tmp255__length1;
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data = (g_free (data), NULL);
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data = _tmp256_;
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data_length1 = _tmp256__length1;
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_data_size_ = data_length1;
 #line 3653 "book.c"
 						}
-#line 453 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						jpeg_data = (g_free (jpeg_data), NULL);
 #line 3657 "book.c"
 					}
-#line 463 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp257_ = filter;
-#line 463 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					if (_tmp257_ == NULL) {
 #line 3663 "book.c"
 						gchar* _tmp258_ = NULL;
@@ -3665,489 +3665,489 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 						gint _tmp259__length1 = 0;
 						guint8* _tmp260_ = NULL;
 						gint _tmp260__length1 = 0;
-#line 465 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp258_ = g_strdup ("FlateDecode");
-#line 465 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_g_free0 (filter);
-#line 465 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						filter = _tmp258_;
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp259_ = compressed_data;
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp259__length1 = compressed_data_length1;
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp260_ = (_tmp259_ != NULL) ? _vala_array_dup2 (_tmp259_, _tmp259__length1) : ((gpointer) _tmp259_);
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_tmp260__length1 = _tmp259__length1;
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						data = (g_free (data), NULL);
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						data = _tmp260_;
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						data_length1 = _tmp260__length1;
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_data_size_ = data_length1;
 #line 3691 "book.c"
 					}
 				}
-#line 471 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp261_ = writer;
-#line 471 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp261_, "\n");
-#line 472 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp262_ = writer;
-#line 472 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp263_ = pdf_writer_start_object (_tmp262_);
-#line 472 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				number = _tmp263_;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp264_ = writer;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp265_ = number;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp266_ = g_strdup_printf ("%u 0 obj\n", _tmp265_);
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp267_ = _tmp266_;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp264_, _tmp267_);
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp267_);
-#line 474 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp268_ = writer;
-#line 474 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp268_, "<<\n");
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp269_ = writer;
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp269_, "/Type /Page\n");
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp270_ = writer;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp271_ = pages_number;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp272_ = g_strdup_printf ("/Parent %u 0 R\n", _tmp271_);
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp273_ = _tmp272_;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp270_, _tmp273_);
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp273_);
-#line 477 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp274_ = writer;
-#line 477 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp275_ = i;
-#line 477 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp276_ = number;
-#line 477 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp277_ = g_strdup_printf ("/Resources << /XObject << /Im%d %u 0 R >> >>\n", _tmp275_, _tmp276_ + 1);
-#line 477 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp278_ = _tmp277_;
-#line 477 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp274_, _tmp278_);
-#line 477 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp278_);
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp279_ = writer;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp280_ = page_width;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp281_ = width_buffer;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp281__length1 = width_buffer_length1;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp282_ = g_ascii_formatd (_tmp281_, _tmp281__length1, "%.2f", _tmp280_);
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp283_ = page_height;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp284_ = height_buffer;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp284__length1 = height_buffer_length1;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp285_ = g_ascii_formatd (_tmp284_, _tmp284__length1, "%.2f", _tmp283_);
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp286_ = g_strdup_printf ("/MediaBox [ 0 0 %s %s ]\n", _tmp282_, _tmp285_);
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp287_ = _tmp286_;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp279_, _tmp287_);
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp287_);
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp288_ = writer;
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp289_ = number;
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp290_ = g_strdup_printf ("/Contents %u 0 R\n", _tmp289_ + 2);
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp291_ = _tmp290_;
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp288_, _tmp291_);
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp291_);
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp292_ = writer;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp292_, ">>\n");
-#line 481 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp293_ = writer;
-#line 481 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp293_, "endobj\n");
-#line 484 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp294_ = writer;
-#line 484 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp294_, "\n");
-#line 485 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp295_ = writer;
-#line 485 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp296_ = pdf_writer_start_object (_tmp295_);
-#line 485 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				number = _tmp296_;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp297_ = writer;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp298_ = number;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp299_ = g_strdup_printf ("%u 0 obj\n", _tmp298_);
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp300_ = _tmp299_;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp297_, _tmp300_);
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp300_);
-#line 487 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp301_ = writer;
-#line 487 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp301_, "<<\n");
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp302_ = writer;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp302_, "/Type /XObject\n");
-#line 489 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp303_ = writer;
-#line 489 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp303_, "/Subtype /Image\n");
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp304_ = writer;
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp305_ = width;
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp306_ = g_strdup_printf ("/Width %d\n", _tmp305_);
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp307_ = _tmp306_;
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp304_, _tmp307_);
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp307_);
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp308_ = writer;
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp309_ = height;
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp310_ = g_strdup_printf ("/Height %d\n", _tmp309_);
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp311_ = _tmp310_;
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp308_, _tmp311_);
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp311_);
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp312_ = writer;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp313_ = color_space;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp314_ = g_strdup_printf ("/ColorSpace /%s\n", _tmp313_);
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp315_ = _tmp314_;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp312_, _tmp315_);
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp315_);
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp316_ = writer;
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp317_ = depth;
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp318_ = g_strdup_printf ("/BitsPerComponent %d\n", _tmp317_);
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp319_ = _tmp318_;
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp316_, _tmp319_);
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp319_);
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp320_ = writer;
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp321_ = data;
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp321__length1 = data_length1;
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp322_ = g_strdup_printf ("/Length %d\n", _tmp321__length1);
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp323_ = _tmp322_;
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp320_, _tmp323_);
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp323_);
-#line 495 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp324_ = filter;
-#line 495 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (_tmp324_ != NULL) {
 #line 3896 "book.c"
 					PDFWriter* _tmp325_ = NULL;
 					const gchar* _tmp326_ = NULL;
 					gchar* _tmp327_ = NULL;
 					gchar* _tmp328_ = NULL;
-#line 496 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp325_ = writer;
-#line 496 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp326_ = filter;
-#line 496 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp327_ = g_strdup_printf ("/Filter /%s\n", _tmp326_);
-#line 496 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_tmp328_ = _tmp327_;
-#line 496 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					pdf_writer_write_string (_tmp325_, _tmp328_);
-#line 496 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_g_free0 (_tmp328_);
 #line 3913 "book.c"
 				}
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp329_ = writer;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp329_, ">>\n");
-#line 498 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp330_ = writer;
-#line 498 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp330_, "stream\n");
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp331_ = writer;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp332_ = data;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp332__length1 = data_length1;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write (_tmp331_, _tmp332_, _tmp332__length1);
-#line 500 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp333_ = writer;
-#line 500 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp333_, "\n");
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp334_ = writer;
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp334_, "endstream\n");
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp335_ = writer;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp335_, "endobj\n");
-#line 505 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp336_ = page_width;
-#line 505 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp337_ = width_buffer;
-#line 505 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp337__length1 = width_buffer_length1;
-#line 505 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp338_ = g_ascii_formatd (_tmp337_, _tmp337__length1, "%f", _tmp336_);
-#line 505 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp339_ = page_height;
-#line 505 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp340_ = height_buffer;
-#line 505 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp340__length1 = height_buffer_length1;
-#line 505 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp341_ = g_ascii_formatd (_tmp340_, _tmp340__length1, "%f", _tmp339_);
-#line 505 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp342_ = i;
-#line 505 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp343_ = g_strdup_printf ("q\n%s 0 0 %s 0 0 cm\n/Im%d Do\nQ", _tmp338_, _tmp341_, _tmp342_);
-#line 505 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				command = _tmp343_;
-#line 506 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp344_ = writer;
-#line 506 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp344_, "\n");
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp345_ = writer;
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp346_ = pdf_writer_start_object (_tmp345_);
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				number = _tmp346_;
-#line 508 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp347_ = writer;
-#line 508 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp348_ = number;
-#line 508 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp349_ = g_strdup_printf ("%u 0 obj\n", _tmp348_);
-#line 508 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp350_ = _tmp349_;
-#line 508 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp347_, _tmp350_);
-#line 508 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp350_);
-#line 509 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp351_ = writer;
-#line 509 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp351_, "<<\n");
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp352_ = writer;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp353_ = command;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp354_ = strlen (_tmp353_);
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp355_ = _tmp354_;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp356_ = g_strdup_printf ("/Length %d\n", _tmp355_);
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp357_ = _tmp356_;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp352_, _tmp357_);
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp357_);
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp358_ = writer;
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp358_, ">>\n");
-#line 512 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp359_ = writer;
-#line 512 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp359_, "stream\n");
-#line 513 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp360_ = writer;
-#line 513 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp361_ = command;
-#line 513 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp360_, _tmp361_);
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp362_ = writer;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp362_, "\n");
-#line 515 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp363_ = writer;
-#line 515 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp363_, "endstream\n");
-#line 516 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp364_ = writer;
-#line 516 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp364_, "endobj\n");
-#line 518 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp365_ = i;
-#line 518 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_emit_by_name (self, "saving", _tmp365_);
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (command);
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				compressed_data = (g_free (compressed_data), NULL);
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				data = (g_free (data), NULL);
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				height_buffer = (g_free (height_buffer), NULL);
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				width_buffer = (g_free (width_buffer), NULL);
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (filter);
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (color_space);
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_object_unref0 (image);
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
 #line 4055 "book.c"
 			}
 		}
 	}
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp366_ = writer;
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp366_, "\n");
-#line 523 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp367_ = writer;
-#line 523 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp368_ = pdf_writer_start_object (_tmp367_);
-#line 523 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	info_number = _tmp368_;
-#line 524 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp369_ = writer;
-#line 524 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp370_ = info_number;
-#line 524 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp371_ = g_strdup_printf ("%u 0 obj\n", _tmp370_);
-#line 524 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp372_ = _tmp371_;
-#line 524 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp369_, _tmp372_);
-#line 524 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp372_);
-#line 525 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp373_ = writer;
-#line 525 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp373_, "<<\n");
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp374_ = writer;
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp375_ = g_strdup_printf ("/Creator (Simple Scan %s)\n", VERSION);
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp376_ = _tmp375_;
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp374_, _tmp376_);
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp376_);
-#line 527 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp377_ = writer;
-#line 527 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp377_, ">>\n");
-#line 528 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp378_ = writer;
-#line 528 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp378_, "endobj\n");
-#line 531 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp379_ = writer;
-#line 531 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp379_, "\n");
-#line 532 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp380_ = writer;
-#line 532 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp381_ = _tmp380_->offset;
-#line 532 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	xref_offset = _tmp381_;
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp382_ = writer;
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp382_, "xref\n");
-#line 534 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp383_ = writer;
-#line 534 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp384_ = writer;
-#line 534 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp385_ = _tmp384_->object_offsets;
-#line 534 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp386_ = g_list_length (_tmp385_);
-#line 534 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp387_ = g_strdup_printf ("0 %zu\n", (gsize) (_tmp386_ + 1));
-#line 534 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp388_ = _tmp387_;
-#line 534 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp383_, _tmp388_);
-#line 534 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp388_);
-#line 535 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp389_ = writer;
-#line 535 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp389_, "0000000000 65535 f \n");
-#line 536 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp390_ = writer;
-#line 536 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp391_ = _tmp390_->object_offsets;
 #line 4141 "book.c"
 	{
 		GList* offset_collection = NULL;
 		GList* offset_it = NULL;
-#line 536 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		offset_collection = _tmp391_;
-#line 536 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		for (offset_it = offset_collection; offset_it != NULL; offset_it = offset_it->next) {
 #line 4149 "book.c"
 			guint offset = 0U;
-#line 536 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			offset = (guint) ((guintptr) offset_it->data);
 #line 4153 "book.c"
 			{
@@ -4155,117 +4155,117 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 				guint _tmp393_ = 0U;
 				gchar* _tmp394_ = NULL;
 				gchar* _tmp395_ = NULL;
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp392_ = writer;
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp393_ = offset;
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp394_ = g_strdup_printf ("%010zu 00000 n \n", (gsize) _tmp393_);
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp395_ = _tmp394_;
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pdf_writer_write_string (_tmp392_, _tmp395_);
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_free0 (_tmp395_);
 #line 4171 "book.c"
 			}
 		}
 	}
-#line 540 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp396_ = writer;
-#line 540 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp396_, "\n");
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp397_ = writer;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp397_, "trailer\n");
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp398_ = writer;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp398_, "<<\n");
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp399_ = writer;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp400_ = writer;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp401_ = _tmp400_->object_offsets;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp402_ = g_list_length (_tmp401_);
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp403_ = g_strdup_printf ("/Size %zu\n", (gsize) (_tmp402_ + 1));
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp404_ = _tmp403_;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp399_, _tmp404_);
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp404_);
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp405_ = writer;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp406_ = info_number;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp407_ = g_strdup_printf ("/Info %u 0 R\n", _tmp406_);
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp408_ = _tmp407_;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp405_, _tmp408_);
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp408_);
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp409_ = writer;
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp410_ = catalog_number;
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp411_ = g_strdup_printf ("/Root %u 0 R\n", _tmp410_);
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp412_ = _tmp411_;
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp409_, _tmp412_);
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp412_);
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp413_ = writer;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp414_ = id;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp415_ = id;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp416_ = g_strdup_printf ("/ID [<%s> <%s>]\n", _tmp414_, _tmp415_);
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp417_ = _tmp416_;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp413_, _tmp417_);
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp417_);
-#line 547 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 547 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp418_ = writer;
-#line 547 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 547 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp418_, ">>\n");
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp419_ = writer;
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp419_, "startxref\n");
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp420_ = writer;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp421_ = xref_offset;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp422_ = g_strdup_printf ("%zu\n", _tmp421_);
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp423_ = _tmp422_;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp420_, _tmp423_);
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp423_);
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp424_ = writer;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp424_, "%%EOF\n");
-#line 257 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_pdf_writer_unref0 (writer);
-#line 257 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (stream);
-#line 257 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (id);
 #line 4271 "book.c"
 }
@@ -4275,33 +4275,33 @@ void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	GQuark _tmp3_ = 0U;
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label0 = 0;
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label1 = 0;
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label2 = 0;
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label3 = 0;
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label4 = 0;
 #line 4289 "book.c"
 	GError * _inner_error_ = NULL;
-#line 553 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 553 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (type != NULL);
-#line 553 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = type;
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _tmp0_;
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (((_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("jpeg")))) || (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("png"))))) || (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("tiff"))))) {
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		switch (0) {
 #line 4307 "book.c"
 			default:
@@ -4309,74 +4309,74 @@ void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError
 				const gchar* _tmp4_ = NULL;
 				gint _tmp5_ = 0;
 				GFile* _tmp6_ = NULL;
-#line 560 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = type;
-#line 560 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp5_ = quality;
-#line 560 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp6_ = file;
-#line 560 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_multi_file (self, _tmp4_, _tmp5_, _tmp6_, &_inner_error_);
-#line 560 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 560 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
-#line 560 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
 #line 4327 "book.c"
 				}
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				break;
 #line 4331 "book.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("ps")))) {
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		switch (0) {
 #line 4337 "book.c"
 			default:
 			{
 				GFile* _tmp7_ = NULL;
-#line 563 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp7_ = file;
-#line 563 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_ps (self, _tmp7_, &_inner_error_);
-#line 563 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 563 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
-#line 563 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
 #line 4351 "book.c"
 				}
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				break;
 #line 4355 "book.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label4) ? _tmp2_label4 : (_tmp2_label4 = g_quark_from_static_string ("pdf")))) {
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		switch (0) {
 #line 4361 "book.c"
 			default:
 			{
 				GFile* _tmp8_ = NULL;
 				gint _tmp9_ = 0;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp8_ = file;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp9_ = quality;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_pdf (self, _tmp8_, _tmp9_, &_inner_error_);
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
 #line 4378 "book.c"
 				}
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				break;
 #line 4382 "book.c"
 			}
@@ -4389,15 +4389,15 @@ guint book_get_n_pages (Book* self) {
 	guint result;
 	GList* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 16 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 16 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, 0U);
-#line 16 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 16 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
-#line 16 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 16 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = g_list_length (_tmp0_);
-#line 16 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 16 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp1_;
-#line 16 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 16 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
 #line 4403 "book.c"
 }
@@ -4406,13 +4406,13 @@ guint book_get_n_pages (Book* self) {
 gboolean book_get_needs_saving (Book* self) {
 	gboolean result;
 	gboolean _tmp0_ = FALSE;
-#line 21 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 21 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 21 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 21 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->needs_saving_;
-#line 21 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 21 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp0_;
-#line 21 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 21 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
 #line 4418 "book.c"
 }
@@ -4422,23 +4422,23 @@ void book_set_needs_saving (Book* self, gboolean value) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 22 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 22 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 24 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 24 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->needs_saving_;
-#line 24 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 24 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = value;
-#line 24 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 24 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 25 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 25 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
 #line 4436 "book.c"
 	}
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = value;
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->needs_saving_ = _tmp2_;
-#line 27 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "needs-saving-changed");
 #line 4444 "book.c"
 }
@@ -4451,41 +4451,41 @@ static void g_cclosure_user_marshal_VOID__PAGE (GClosure * closure, GValue * ret
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (n_param_values == 2);
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		data1 = closure->data;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		data2 = param_values->data[0].v_pointer;
 #line 4463 "book.c"
 	} else {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		data2 = closure->data;
 #line 4469 "book.c"
 	}
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	callback = (GMarshalFunc_VOID__PAGE) (marshal_data ? marshal_data : cc->callback);
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	callback (data1, value_get_page (param_values + 1), data2);
 #line 4475 "book.c"
 }
 
 
 static void value_book_init (GValue* value) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
 #line 4482 "book.c"
 }
 
 
 static void value_book_free_value (GValue* value) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (value->data[0].v_pointer) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		book_unref (value->data[0].v_pointer);
 #line 4491 "book.c"
 	}
@@ -4493,13 +4493,13 @@ static void value_book_free_value (GValue* value) {
 
 
 static void value_book_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (src_value->data[0].v_pointer) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = book_ref (src_value->data[0].v_pointer);
 #line 4501 "book.c"
 	} else {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 4505 "book.c"
 	}
@@ -4507,37 +4507,37 @@ static void value_book_copy_value (const GValue* src_value, GValue* dest_value)
 
 
 static gpointer value_book_peek_pointer (const GValue* value) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
 #line 4513 "book.c"
 }
 
 
 static gchar* value_book_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
 #line 4520 "book.c"
 		Book* object;
 		object = collect_values[0].v_pointer;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 4527 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 4531 "book.c"
 		}
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = book_ref (object);
 #line 4535 "book.c"
 	} else {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
 #line 4539 "book.c"
 	}
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
 #line 4543 "book.c"
 }
@@ -4546,27 +4546,27 @@ static gchar* value_book_collect_value (GValue* value, guint n_collect_values, G
 static gchar* value_book_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	Book** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!object_p) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 4554 "book.c"
 	}
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
 #line 4560 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
 #line 4564 "book.c"
 	} else {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = book_ref (value->data[0].v_pointer);
 #line 4568 "book.c"
 	}
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
 #line 4572 "book.c"
 }
@@ -4574,22 +4574,22 @@ static gchar* value_book_lcopy_value (const GValue* value, guint n_collect_value
 
 GParamSpec* param_spec_book (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecBook* spec;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_BOOK), NULL);
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
 #line 4586 "book.c"
 }
 
 
 gpointer value_get_book (const GValue* value) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BOOK), NULL);
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
 #line 4595 "book.c"
 }
@@ -4597,29 +4597,29 @@ gpointer value_get_book (const GValue* value) {
 
 void value_set_book (GValue* value, gpointer v_object) {
 	Book* old;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BOOK));
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BOOK));
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		book_ref (value->data[0].v_pointer);
 #line 4615 "book.c"
 	} else {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
 #line 4619 "book.c"
 	}
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		book_unref (old);
 #line 4625 "book.c"
 	}
@@ -4628,27 +4628,27 @@ void value_set_book (GValue* value, gpointer v_object) {
 
 void value_take_book (GValue* value, gpointer v_object) {
 	Book* old;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BOOK));
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BOOK));
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
 #line 4644 "book.c"
 	} else {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
 #line 4648 "book.c"
 	}
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		book_unref (old);
 #line 4654 "book.c"
 	}
@@ -4656,32 +4656,32 @@ void value_take_book (GValue* value, gpointer v_object) {
 
 
 static void book_class_init (BookClass * klass) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_parent_class = g_type_class_peek_parent (klass);
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	((BookClass *) klass)->finalize = book_finalize;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_type_class_add_private (klass, sizeof (BookPrivate));
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_new ("page_added", TYPE_BOOK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PAGE, G_TYPE_NONE, 1, TYPE_PAGE);
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_new ("page_removed", TYPE_BOOK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PAGE, G_TYPE_NONE, 1, TYPE_PAGE);
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_new ("reordered", TYPE_BOOK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_new ("cleared", TYPE_BOOK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_new ("needs_saving_changed", TYPE_BOOK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_new ("saving", TYPE_BOOK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
 #line 4678 "book.c"
 }
 
 
 static void book_instance_init (Book * self) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv = BOOK_GET_PRIVATE (self);
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
 #line 4687 "book.c"
 }
@@ -4690,26 +4690,26 @@ static void book_instance_init (Book * self) {
 static void book_finalize (Book* obj) {
 	Book * self;
 	GList* _tmp0_ = NULL;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BOOK, Book);
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_handlers_destroy (self);
-#line 45 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
 #line 4700 "book.c"
 	{
 		GList* page_collection = NULL;
 		GList* page_it = NULL;
-#line 45 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		page_collection = _tmp0_;
-#line 45 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		for (page_it = page_collection; page_it != NULL; page_it = page_it->next) {
 #line 4708 "book.c"
 			Page* _tmp1_ = NULL;
 			Page* page = NULL;
-#line 45 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp1_ = _page_ref0 ((Page*) page_it->data);
-#line 45 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			page = _tmp1_;
 #line 4715 "book.c"
 			{
@@ -4717,27 +4717,27 @@ static void book_finalize (Book* obj) {
 				guint _tmp3_ = 0U;
 				Page* _tmp4_ = NULL;
 				guint _tmp5_ = 0U;
-#line 47 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp2_ = page;
-#line 47 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 47 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _book_page_changed_cb_page_pixels_changed, self);
-#line 48 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = page;
-#line 48 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp5_, NULL, FALSE);
-#line 48 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _book_page_changed_cb_page_crop_changed, self);
-#line 45 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
 #line 4735 "book.c"
 			}
 		}
 	}
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	__g_list_free__page_unref0_0 (self->priv->pages);
-#line 231 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_byte_array_unref0 (self->priv->jpeg_data);
 #line 4743 "book.c"
 }
@@ -4760,9 +4760,9 @@ GType book_get_type (void) {
 gpointer book_ref (gpointer instance) {
 	Book* self;
 	self = instance;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
 #line 4768 "book.c"
 }
@@ -4771,11 +4771,11 @@ gpointer book_ref (gpointer instance) {
 void book_unref (gpointer instance) {
 	Book* self;
 	self = instance;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		BOOK_GET_CLASS (self)->finalize (self);
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 4781 "book.c"
 	}
@@ -4783,7 +4783,7 @@ void book_unref (gpointer instance) {
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 580 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self ? g_object_ref (self) : NULL;
 #line 4789 "book.c"
 }
@@ -4793,26 +4793,26 @@ PDFWriter* pdf_writer_construct (GType object_type, GFileOutputStream* stream) {
 	PDFWriter* self = NULL;
 	GFileOutputStream* _tmp0_ = NULL;
 	GFileOutputStream* _tmp1_ = NULL;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (stream != NULL, NULL);
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = (PDFWriter*) g_type_create_instance (object_type);
-#line 580 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = stream;
-#line 580 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 580 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->priv->stream);
-#line 580 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->stream = _tmp1_;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
 #line 4811 "book.c"
 }
 
 
 PDFWriter* pdf_writer_new (GFileOutputStream* stream) {
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return pdf_writer_construct (TYPE_PDF_WRITER, stream);
 #line 4818 "book.c"
 }
@@ -4823,22 +4823,22 @@ void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
 	guint8* _tmp5_ = NULL;
 	gint _tmp5__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
 #line 4829 "book.c"
 	{
 		GFileOutputStream* _tmp0_ = NULL;
 		guint8* _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
-#line 587 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp0_ = self->priv->stream;
-#line 587 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1_ = data;
-#line 587 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1__length1 = data_length1;
-#line 587 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_output_stream_write_all ((GOutputStream*) _tmp0_, _tmp1_, (gsize) _tmp1__length1, NULL, NULL, &_inner_error_);
-#line 587 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4844 "book.c"
 			goto __catch1_g_error;
@@ -4850,38 +4850,38 @@ void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
 		GError* e = NULL;
 		GError* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		e = _inner_error_;
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_inner_error_ = NULL;
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp2_ = e;
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp3_ = _tmp2_->message;
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_warning ("book.vala:591: Error writing PDF: %s", _tmp3_);
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_error_free0 (e);
 #line 4866 "book.c"
 	}
 	__finally1:
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_clear_error (&_inner_error_);
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
 #line 4877 "book.c"
 	}
-#line 593 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = self->offset;
-#line 593 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = data;
-#line 593 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5__length1 = data_length1;
-#line 593 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->offset = _tmp4_ + _tmp5__length1;
 #line 4887 "book.c"
 }
@@ -4954,21 +4954,21 @@ void pdf_writer_write_string (PDFWriter* self, const gchar* text) {
 	gchar* _tmp2_ = NULL;
 	guint8* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 596 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 596 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (text != NULL);
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = text;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = string_to_utf8 (_tmp0_, &_tmp1_);
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = (guint8*) _tmp2_;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3__length1 = (_tmp1_ * sizeof (gchar)) / sizeof (guint8);
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write (self, _tmp3_, (_tmp1_ * sizeof (gchar)) / sizeof (guint8));
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = (g_free (_tmp3_), NULL);
 #line 4974 "book.c"
 }
@@ -4979,35 +4979,35 @@ guint pdf_writer_start_object (PDFWriter* self) {
 	gsize _tmp0_ = 0UL;
 	GList* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, 0U);
-#line 603 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->offset;
-#line 603 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->object_offsets = g_list_append (self->object_offsets, (gpointer) ((guintptr) ((guint) _tmp0_)));
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = self->object_offsets;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = g_list_length (_tmp1_);
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp2_;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
 #line 4997 "book.c"
 }
 
 
 static void value_pdf_writer_init (GValue* value) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
 #line 5004 "book.c"
 }
 
 
 static void value_pdf_writer_free_value (GValue* value) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (value->data[0].v_pointer) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (value->data[0].v_pointer);
 #line 5013 "book.c"
 	}
@@ -5015,13 +5015,13 @@ static void value_pdf_writer_free_value (GValue* value) {
 
 
 static void value_pdf_writer_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (src_value->data[0].v_pointer) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = pdf_writer_ref (src_value->data[0].v_pointer);
 #line 5023 "book.c"
 	} else {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 5027 "book.c"
 	}
@@ -5029,37 +5029,37 @@ static void value_pdf_writer_copy_value (const GValue* src_value, GValue* dest_v
 
 
 static gpointer value_pdf_writer_peek_pointer (const GValue* value) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
 #line 5035 "book.c"
 }
 
 
 static gchar* value_pdf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
 #line 5042 "book.c"
 		PDFWriter* object;
 		object = collect_values[0].v_pointer;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 5049 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 5053 "book.c"
 		}
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = pdf_writer_ref (object);
 #line 5057 "book.c"
 	} else {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
 #line 5061 "book.c"
 	}
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
 #line 5065 "book.c"
 }
@@ -5068,27 +5068,27 @@ static gchar* value_pdf_writer_collect_value (GValue* value, guint n_collect_val
 static gchar* value_pdf_writer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PDFWriter** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!object_p) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 5076 "book.c"
 	}
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
 #line 5082 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
 #line 5086 "book.c"
 	} else {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = pdf_writer_ref (value->data[0].v_pointer);
 #line 5090 "book.c"
 	}
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
 #line 5094 "book.c"
 }
@@ -5096,22 +5096,22 @@ static gchar* value_pdf_writer_lcopy_value (const GValue* value, guint n_collect
 
 GParamSpec* param_spec_pdf_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPDFWriter* spec;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PDF_WRITER), NULL);
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
 #line 5108 "book.c"
 }
 
 
 gpointer value_get_pdf_writer (const GValue* value) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PDF_WRITER), NULL);
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
 #line 5117 "book.c"
 }
@@ -5119,29 +5119,29 @@ gpointer value_get_pdf_writer (const GValue* value) {
 
 void value_set_pdf_writer (GValue* value, gpointer v_object) {
 	PDFWriter* old;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PDF_WRITER));
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PDF_WRITER));
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_ref (value->data[0].v_pointer);
 #line 5137 "book.c"
 	} else {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
 #line 5141 "book.c"
 	}
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (old);
 #line 5147 "book.c"
 	}
@@ -5150,27 +5150,27 @@ void value_set_pdf_writer (GValue* value, gpointer v_object) {
 
 void value_take_pdf_writer (GValue* value, gpointer v_object) {
 	PDFWriter* old;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PDF_WRITER));
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PDF_WRITER));
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
 #line 5166 "book.c"
 	} else {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
 #line 5170 "book.c"
 	}
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (old);
 #line 5176 "book.c"
 	}
@@ -5178,22 +5178,22 @@ void value_take_pdf_writer (GValue* value, gpointer v_object) {
 
 
 static void pdf_writer_class_init (PDFWriterClass * klass) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_parent_class = g_type_class_peek_parent (klass);
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	((PDFWriterClass *) klass)->finalize = pdf_writer_finalize;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_type_class_add_private (klass, sizeof (PDFWriterPrivate));
 #line 5188 "book.c"
 }
 
 
 static void pdf_writer_instance_init (PDFWriter * self) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv = PDF_WRITER_GET_PRIVATE (self);
-#line 574 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->offset = (gsize) 0;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
 #line 5199 "book.c"
 }
@@ -5201,13 +5201,13 @@ static void pdf_writer_instance_init (PDFWriter * self) {
 
 static void pdf_writer_finalize (PDFWriter* obj) {
 	PDFWriter * self;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PDF_WRITER, PDFWriter);
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_handlers_destroy (self);
-#line 575 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_list_free0 (self->object_offsets);
-#line 576 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->priv->stream);
 #line 5213 "book.c"
 }
@@ -5230,9 +5230,9 @@ GType pdf_writer_get_type (void) {
 gpointer pdf_writer_ref (gpointer instance) {
 	PDFWriter* self;
 	self = instance;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
 #line 5238 "book.c"
 }
@@ -5241,11 +5241,11 @@ gpointer pdf_writer_ref (gpointer instance) {
 void pdf_writer_unref (gpointer instance) {
 	PDFWriter* self;
 	self = instance;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		PDF_WRITER_GET_CLASS (self)->finalize (self);
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 5251 "book.c"
 	}
@@ -5255,7 +5255,7 @@ void pdf_writer_unref (gpointer instance) {
 static cairo_status_t _ps_writer_write_cairo_data_cairo_write_func_t (gpointer self, guchar* data, int data_length1) {
 	cairo_status_t result;
 	result = ps_writer_write_cairo_data ((PsWriter*) self, data, data_length1);
-#line 616 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
 #line 5261 "book.c"
 }
@@ -5266,32 +5266,32 @@ PsWriter* ps_writer_construct (GType object_type, GFileOutputStream* stream) {
 	GFileOutputStream* _tmp0_ = NULL;
 	GFileOutputStream* _tmp1_ = NULL;
 	cairo_surface_t* _tmp2_ = NULL;
-#line 613 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (stream != NULL, NULL);
-#line 613 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = (PsWriter*) g_type_create_instance (object_type);
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = stream;
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->stream);
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->stream = _tmp1_;
-#line 616 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = cairo_ps_surface_create_for_stream (_ps_writer_write_cairo_data_cairo_write_func_t, self, (gdouble) 0, (gdouble) 0);
-#line 616 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_surface_destroy0 (self->surface);
-#line 616 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->surface = _tmp2_;
-#line 613 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
 #line 5290 "book.c"
 }
 
 
 PsWriter* ps_writer_new (GFileOutputStream* stream) {
-#line 613 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return ps_writer_construct (TYPE_PS_WRITER, stream);
 #line 5297 "book.c"
 }
@@ -5300,22 +5300,22 @@ PsWriter* ps_writer_new (GFileOutputStream* stream) {
 static cairo_status_t ps_writer_write_cairo_data (PsWriter* self, guint8* data, int data_length1) {
 	cairo_status_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 619 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, 0);
 #line 5306 "book.c"
 	{
 		GFileOutputStream* _tmp0_ = NULL;
 		guint8* _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
-#line 623 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp0_ = self->stream;
-#line 623 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1_ = data;
-#line 623 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1__length1 = data_length1;
-#line 623 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_output_stream_write_all ((GOutputStream*) _tmp0_, _tmp1_, (gsize) _tmp1__length1, NULL, NULL, &_inner_error_);
-#line 623 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5321 "book.c"
 			goto __catch2_g_error;
@@ -5327,54 +5327,54 @@ static cairo_status_t ps_writer_write_cairo_data (PsWriter* self, guint8* data,
 		GError* e = NULL;
 		GError* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		e = _inner_error_;
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_inner_error_ = NULL;
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp2_ = e;
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp3_ = _tmp2_->message;
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_warning ("book.vala:627: Error writing data: %s", _tmp3_);
-#line 628 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		result = CAIRO_STATUS_WRITE_ERROR;
-#line 628 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_error_free0 (e);
-#line 628 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return result;
 #line 5347 "book.c"
 	}
 	__finally2:
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_clear_error (&_inner_error_);
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return 0;
 #line 5358 "book.c"
 	}
-#line 631 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = CAIRO_STATUS_SUCCESS;
-#line 631 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
 #line 5364 "book.c"
 }
 
 
 static void value_ps_writer_init (GValue* value) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
 #line 5371 "book.c"
 }
 
 
 static void value_ps_writer_free_value (GValue* value) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (value->data[0].v_pointer) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (value->data[0].v_pointer);
 #line 5380 "book.c"
 	}
@@ -5382,13 +5382,13 @@ static void value_ps_writer_free_value (GValue* value) {
 
 
 static void value_ps_writer_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (src_value->data[0].v_pointer) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = ps_writer_ref (src_value->data[0].v_pointer);
 #line 5390 "book.c"
 	} else {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 5394 "book.c"
 	}
@@ -5396,37 +5396,37 @@ static void value_ps_writer_copy_value (const GValue* src_value, GValue* dest_va
 
 
 static gpointer value_ps_writer_peek_pointer (const GValue* value) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
 #line 5402 "book.c"
 }
 
 
 static gchar* value_ps_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
 #line 5409 "book.c"
 		PsWriter* object;
 		object = collect_values[0].v_pointer;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 5416 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 5420 "book.c"
 		}
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = ps_writer_ref (object);
 #line 5424 "book.c"
 	} else {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
 #line 5428 "book.c"
 	}
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
 #line 5432 "book.c"
 }
@@ -5435,27 +5435,27 @@ static gchar* value_ps_writer_collect_value (GValue* value, guint n_collect_valu
 static gchar* value_ps_writer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PsWriter** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!object_p) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 5443 "book.c"
 	}
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
 #line 5449 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
 #line 5453 "book.c"
 	} else {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = ps_writer_ref (value->data[0].v_pointer);
 #line 5457 "book.c"
 	}
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
 #line 5461 "book.c"
 }
@@ -5463,22 +5463,22 @@ static gchar* value_ps_writer_lcopy_value (const GValue* value, guint n_collect_
 
 GParamSpec* param_spec_ps_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPsWriter* spec;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PS_WRITER), NULL);
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
 #line 5475 "book.c"
 }
 
 
 gpointer value_get_ps_writer (const GValue* value) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PS_WRITER), NULL);
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
 #line 5484 "book.c"
 }
@@ -5486,29 +5486,29 @@ gpointer value_get_ps_writer (const GValue* value) {
 
 void value_set_ps_writer (GValue* value, gpointer v_object) {
 	PsWriter* old;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PS_WRITER));
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PS_WRITER));
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_ref (value->data[0].v_pointer);
 #line 5504 "book.c"
 	} else {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
 #line 5508 "book.c"
 	}
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (old);
 #line 5514 "book.c"
 	}
@@ -5517,27 +5517,27 @@ void value_set_ps_writer (GValue* value, gpointer v_object) {
 
 void value_take_ps_writer (GValue* value, gpointer v_object) {
 	PsWriter* old;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PS_WRITER));
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PS_WRITER));
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
 #line 5533 "book.c"
 	} else {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
 #line 5537 "book.c"
 	}
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (old);
 #line 5543 "book.c"
 	}
@@ -5545,16 +5545,16 @@ void value_take_ps_writer (GValue* value, gpointer v_object) {
 
 
 static void ps_writer_class_init (PsWriterClass * klass) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	ps_writer_parent_class = g_type_class_peek_parent (klass);
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	((PsWriterClass *) klass)->finalize = ps_writer_finalize;
 #line 5553 "book.c"
 }
 
 
 static void ps_writer_instance_init (PsWriter * self) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
 #line 5560 "book.c"
 }
@@ -5562,13 +5562,13 @@ static void ps_writer_instance_init (PsWriter * self) {
 
 static void ps_writer_finalize (PsWriter* obj) {
 	PsWriter * self;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PS_WRITER, PsWriter);
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_handlers_destroy (self);
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_surface_destroy0 (self->surface);
-#line 611 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->stream);
 #line 5574 "book.c"
 }
@@ -5591,9 +5591,9 @@ GType ps_writer_get_type (void) {
 gpointer ps_writer_ref (gpointer instance) {
 	PsWriter* self;
 	self = instance;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
 #line 5599 "book.c"
 }
@@ -5602,11 +5602,11 @@ gpointer ps_writer_ref (gpointer instance) {
 void ps_writer_unref (gpointer instance) {
 	PsWriter* self;
 	self = instance;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		PS_WRITER_GET_CLASS (self)->finalize (self);
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 5612 "book.c"
 	}
diff --git a/src/page-view.c b/src/page-view.c
index c7c9cd0..a5377dd 100644
--- a/src/page-view.c
+++ b/src/page-view.c
@@ -216,35 +216,35 @@ GType crop_location_get_type (void) {
 
 
 static void _page_view_page_pixels_changed_cb_page_pixels_changed (Page* _sender, gpointer self) {
-#line 97 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_page_pixels_changed_cb ((PageView*) self, _sender);
 #line 222 "page-view.c"
 }
 
 
 static void _page_view_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self) {
-#line 98 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_page_size_changed_cb ((PageView*) self, _sender);
 #line 229 "page-view.c"
 }
 
 
 static void _page_view_page_overlay_changed_cb_page_crop_changed (Page* _sender, gpointer self) {
-#line 99 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_page_overlay_changed_cb ((PageView*) self, _sender);
 #line 236 "page-view.c"
 }
 
 
 static void _page_view_page_overlay_changed_cb_page_scan_line_changed (Page* _sender, gpointer self) {
-#line 100 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_page_overlay_changed_cb ((PageView*) self, _sender);
 #line 243 "page-view.c"
 }
 
 
 static void _page_view_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_scan_direction_changed_cb ((PageView*) self, _sender);
 #line 250 "page-view.c"
 }
@@ -258,42 +258,42 @@ PageView* page_view_construct (GType object_type, Page* page) {
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 85 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (page != NULL, NULL);
-#line 85 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self = (PageView*) g_type_create_instance (object_type);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = page;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_set_page (self, _tmp0_);
-#line 88 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = page;
-#line 88 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_connect (_tmp1_, "pixels-changed", (GCallback) _page_view_page_pixels_changed_cb_page_pixels_changed, self);
-#line 89 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page;
-#line 89 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_connect (_tmp2_, "size-changed", (GCallback) _page_view_page_size_changed_cb_page_size_changed, self);
-#line 90 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = page;
-#line 90 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_connect (_tmp3_, "crop-changed", (GCallback) _page_view_page_overlay_changed_cb_page_crop_changed, self);
-#line 91 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = page;
-#line 91 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_connect (_tmp4_, "scan-line-changed", (GCallback) _page_view_page_overlay_changed_cb_page_scan_line_changed, self);
-#line 92 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp5_ = page;
-#line 92 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_connect (_tmp5_, "scan-direction-changed", (GCallback) _page_view_scan_direction_changed_cb_page_scan_direction_changed, self);
-#line 85 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return self;
 #line 292 "page-view.c"
 }
 
 
 PageView* page_view_new (Page* page) {
-#line 85 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return page_view_construct (TYPE_PAGE_VIEW, page);
 #line 299 "page-view.c"
 }
@@ -301,11 +301,11 @@ PageView* page_view_new (Page* page) {
 
 static guchar page_view_get_sample (PageView* self, guchar* pixels, int pixels_length1, gint offset, gint x, gint depth, gint sample) {
 	guchar result = '\0';
-#line 104 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 107 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = (guchar) 0xFF;
-#line 107 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
 #line 311 "page-view.c"
 }
@@ -369,27 +369,27 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 	gint _tmp129_ = 0;
 	guchar _tmp130_ = '\0';
 	guchar _tmp131_ = '\0';
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (page != NULL);
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = page;
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = page_get_scan_direction (_tmp0_);
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = _tmp1_;
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	switch (_tmp2_) {
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
 #line 387 "page-view.c"
 		{
-#line 115 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
 #line 391 "page-view.c"
 		}
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
 #line 395 "page-view.c"
 		{
@@ -401,31 +401,31 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
 			gint _tmp10_ = 0;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp3_ = page;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp4_ = page_get_scan_width (_tmp3_);
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp5_ = _tmp4_;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp6_ = x;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			x = (_tmp5_ - _tmp6_) - 1;
-#line 118 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp7_ = page;
-#line 118 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp8_ = page_get_scan_height (_tmp7_);
-#line 118 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp9_ = _tmp8_;
-#line 118 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp10_ = y;
-#line 118 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			y = (_tmp9_ - _tmp10_) - 1;
-#line 119 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
 #line 427 "page-view.c"
 		}
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
 #line 431 "page-view.c"
 		{
@@ -436,29 +436,29 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 			gint _tmp14_ = 0;
 			gint _tmp15_ = 0;
 			gint _tmp16_ = 0;
-#line 121 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp11_ = x;
-#line 121 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			t = _tmp11_;
-#line 122 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp12_ = page;
-#line 122 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp13_ = page_get_scan_width (_tmp12_);
-#line 122 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp14_ = _tmp13_;
-#line 122 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp15_ = y;
-#line 122 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			x = (_tmp14_ - _tmp15_) - 1;
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp16_ = t;
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			y = _tmp16_;
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
 #line 460 "page-view.c"
 		}
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
 #line 464 "page-view.c"
 		{
@@ -469,86 +469,86 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 			gint _tmp20_ = 0;
 			gint _tmp21_ = 0;
 			gint _tmp22_ = 0;
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp17_ = x;
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			t = _tmp17_;
-#line 127 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp18_ = y;
-#line 127 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			x = _tmp18_;
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp19_ = page;
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp20_ = page_get_scan_height (_tmp19_);
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp21_ = _tmp20_;
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp22_ = t;
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			y = (_tmp21_ - _tmp22_) - 1;
-#line 129 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
 #line 493 "page-view.c"
 		}
 		default:
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		break;
 #line 498 "page-view.c"
 	}
-#line 132 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp23_ = page;
-#line 132 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp24_ = page_get_depth (_tmp23_);
-#line 132 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp25_ = _tmp24_;
-#line 132 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	depth = _tmp25_;
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp26_ = page;
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp27_ = page_get_n_channels (_tmp26_);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp28_ = _tmp27_;
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	n_channels = _tmp28_;
-#line 134 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp29_ = page;
-#line 134 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp31_ = page_get_pixels (_tmp29_, &_tmp30_);
-#line 134 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	pixels = _tmp31_;
-#line 134 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	pixels_length1 = _tmp30_;
-#line 134 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_pixels_size_ = pixels_length1;
-#line 135 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp32_ = page;
-#line 135 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp33_ = page_get_rowstride (_tmp32_);
-#line 135 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp34_ = _tmp33_;
-#line 135 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp35_ = y;
-#line 135 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	offset = _tmp34_ * _tmp35_;
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp37_ = depth;
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp37_ == 8) {
 #line 540 "page-view.c"
 		gint _tmp38_ = 0;
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp38_ = n_channels;
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp36_ = _tmp38_ == 3;
 #line 546 "page-view.c"
 	} else {
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp36_ = FALSE;
 #line 550 "page-view.c"
 	}
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp36_) {
 #line 554 "page-view.c"
 		gint o = 0;
@@ -576,85 +576,85 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 		gint _tmp54_ = 0;
 		guchar _tmp55_ = '\0';
 		guchar _tmp56_ = '\0';
-#line 140 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp39_ = offset;
-#line 140 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp40_ = x;
-#line 140 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp41_ = n_channels;
-#line 140 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		o = _tmp39_ + (_tmp40_ * _tmp41_);
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp42_ = pixel;
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp42__length1 = pixel_length1;
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp43_ = pixels;
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp43__length1 = pixels_length1;
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp44_ = o;
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp45_ = _tmp43_[_tmp44_];
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp42_[0] = _tmp45_;
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp46_ = _tmp42_[0];
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp47_ = pixel;
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp47__length1 = pixel_length1;
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp48_ = pixels;
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp48__length1 = pixels_length1;
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp49_ = o;
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp50_ = _tmp48_[_tmp49_ + 1];
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp47_[1] = _tmp50_;
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp51_ = _tmp47_[1];
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp52_ = pixel;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp52__length1 = pixel_length1;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp53_ = pixels;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp53__length1 = pixels_length1;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp54_ = o;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp55_ = _tmp53_[_tmp54_ + 2];
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp52_[2] = _tmp55_;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp56_ = _tmp52_[2];
-#line 144 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
 #line 638 "page-view.c"
 	} else {
 		gboolean _tmp57_ = FALSE;
 		gint _tmp58_ = 0;
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp58_ = depth;
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp58_ == 8) {
 #line 646 "page-view.c"
 			gint _tmp59_ = 0;
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp59_ = n_channels;
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp57_ = _tmp59_ == 1;
 #line 652 "page-view.c"
 		} else {
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp57_ = FALSE;
 #line 656 "page-view.c"
 		}
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp57_) {
 #line 660 "page-view.c"
 			guchar* _tmp60_ = NULL;
@@ -671,63 +671,63 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 			guchar _tmp67_ = '\0';
 			guchar _tmp68_ = '\0';
 			guchar _tmp69_ = '\0';
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp60_ = pixel;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp60__length1 = pixel_length1;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp61_ = pixel;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp61__length1 = pixel_length1;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp62_ = pixel;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp62__length1 = pixel_length1;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp63_ = pixels;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp63__length1 = pixels_length1;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp64_ = offset;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp65_ = x;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp66_ = _tmp63_[_tmp64_ + _tmp65_];
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp62_[2] = _tmp66_;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp67_ = _tmp62_[2];
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp61_[1] = _tmp67_;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp68_ = _tmp61_[1];
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp60_[0] = _tmp68_;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp69_ = _tmp60_[0];
-#line 149 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 149 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			return;
 #line 711 "page-view.c"
 		} else {
 			gboolean _tmp70_ = FALSE;
 			gint _tmp71_ = 0;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp71_ = depth;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			if (_tmp71_ == 1) {
 #line 719 "page-view.c"
 				gint _tmp72_ = 0;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp72_ = n_channels;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp70_ = _tmp72_ == 1;
 #line 725 "page-view.c"
 			} else {
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp70_ = FALSE;
 #line 729 "page-view.c"
 			}
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			if (_tmp70_) {
 #line 733 "page-view.c"
 				gint o = 0;
@@ -748,79 +748,79 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 				guchar _tmp83_ = '\0';
 				guchar _tmp84_ = '\0';
 				guchar _tmp85_ = '\0';
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp73_ = offset;
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp74_ = x;
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				o = _tmp73_ + (_tmp74_ / 8);
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp76_ = pixels;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp76__length1 = pixels_length1;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp77_ = o;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp78_ = _tmp76_[_tmp77_];
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp79_ = x;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (((gint) (_tmp78_ & (0x80 >> (_tmp79_ % 8)))) != 0) {
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp75_ = 0x00;
 #line 772 "page-view.c"
 				} else {
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp75_ = 0xFF;
 #line 776 "page-view.c"
 				}
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp80_ = pixel;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp80__length1 = pixel_length1;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp81_ = pixel;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp81__length1 = pixel_length1;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp82_ = pixel;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp82__length1 = pixel_length1;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp82_[2] = (guchar) _tmp75_;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp83_ = _tmp82_[2];
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp81_[1] = _tmp83_;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp84_ = _tmp81_[1];
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp80_[0] = _tmp84_;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp85_ = _tmp80_[0];
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				return;
 #line 804 "page-view.c"
 			} else {
 				gboolean _tmp86_ = FALSE;
 				gint _tmp87_ = 0;
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp87_ = depth;
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (_tmp87_ == 2) {
 #line 812 "page-view.c"
 					gint _tmp88_ = 0;
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp88_ = n_channels;
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp86_ = _tmp88_ == 1;
 #line 818 "page-view.c"
 				} else {
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp86_ = FALSE;
 #line 822 "page-view.c"
 				}
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (_tmp86_) {
 #line 826 "page-view.c"
 					gint block_shift[4] = {0};
@@ -846,144 +846,144 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 					guchar _tmp102_ = '\0';
 					guchar _tmp103_ = '\0';
 					guchar _tmp104_ = '\0';
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp89_[0] = 6;
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp89_[1] = 4;
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp89_[2] = 2;
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp89_[3] = 0;
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					memcpy (block_shift, _tmp89_, 4 * sizeof (gint));
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp90_ = offset;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp91_ = x;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					o = _tmp90_ + (_tmp91_ / 4);
-#line 166 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp92_ = pixels;
-#line 166 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp92__length1 = pixels_length1;
-#line 166 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp93_ = o;
-#line 166 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp94_ = _tmp92_[_tmp93_];
-#line 166 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp95_ = x;
-#line 166 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp96_ = block_shift[_tmp95_ % 4];
-#line 166 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					sample = (_tmp94_ >> _tmp96_) & 0x3;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp97_ = sample;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					sample = (_tmp97_ * 255) / 3;
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp98_ = pixel;
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp98__length1 = pixel_length1;
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp99_ = pixel;
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp99__length1 = pixel_length1;
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp100_ = pixel;
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp100__length1 = pixel_length1;
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp101_ = sample;
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp100_[2] = (guchar) _tmp101_;
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp102_ = _tmp100_[2];
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp99_[1] = _tmp102_;
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp103_ = _tmp99_[1];
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp98_[0] = _tmp103_;
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp104_ = _tmp98_[0];
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					return;
 #line 912 "page-view.c"
 				}
 			}
 		}
 	}
-#line 174 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp105_ = pixel;
-#line 174 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp105__length1 = pixel_length1;
-#line 174 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp106_ = pixels;
-#line 174 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp106__length1 = pixels_length1;
-#line 174 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp107_ = offset;
-#line 174 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp108_ = x;
-#line 174 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp109_ = depth;
-#line 174 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp110_ = x;
-#line 174 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp111_ = n_channels;
-#line 174 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp112_ = page_view_get_sample (self, _tmp106_, _tmp106__length1, _tmp107_, _tmp108_, _tmp109_, _tmp110_ * _tmp111_);
-#line 174 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp105_[0] = _tmp112_;
-#line 174 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp113_ = _tmp105_[0];
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp114_ = pixel;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp114__length1 = pixel_length1;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp115_ = pixels;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp115__length1 = pixels_length1;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp116_ = offset;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp117_ = x;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp118_ = depth;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp119_ = x;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp120_ = n_channels;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp121_ = page_view_get_sample (self, _tmp115_, _tmp115__length1, _tmp116_, _tmp117_, _tmp118_, (_tmp119_ * _tmp120_) + 1);
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp114_[1] = _tmp121_;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp122_ = _tmp114_[1];
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp123_ = pixel;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp123__length1 = pixel_length1;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp124_ = pixels;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp124__length1 = pixels_length1;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp125_ = offset;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp126_ = x;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp127_ = depth;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp128_ = x;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp129_ = n_channels;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp130_ = page_view_get_sample (self, _tmp124_, _tmp124__length1, _tmp125_, _tmp126_, _tmp127_, (_tmp128_ * _tmp129_) + 2);
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp123_[2] = _tmp130_;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp131_ = _tmp123_[2];
 #line 989 "page-view.c"
 }
@@ -1044,116 +1044,116 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 	gdouble _tmp403_ = 0.0;
 	gdouble _tmp404_ = 0.0;
 	guchar _tmp405_ = '\0';
-#line 179 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 179 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (page != NULL);
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = l;
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	L = (gint) _tmp0_;
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = L;
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = l;
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (((gdouble) _tmp1_) != _tmp2_) {
 #line 1062 "page-view.c"
 		gint _tmp3_ = 0;
-#line 227 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp3_ = L;
-#line 227 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		L = _tmp3_ + 1;
 #line 1068 "page-view.c"
 	}
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = r;
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	R = (gint) _tmp4_;
-#line 229 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp5_ = t;
-#line 229 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	T = (gint) _tmp5_;
-#line 230 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = T;
-#line 230 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp7_ = t;
-#line 230 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (((gdouble) _tmp6_) != _tmp7_) {
 #line 1084 "page-view.c"
 		gint _tmp8_ = 0;
-#line 231 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp8_ = T;
-#line 231 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		T = _tmp8_ + 1;
 #line 1090 "page-view.c"
 	}
-#line 232 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp9_ = b;
-#line 232 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	B = (gint) _tmp9_;
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	red = 0.0;
-#line 235 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	green = 0.0;
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	blue = 0.0;
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp12_ = r;
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp13_ = l;
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if ((_tmp12_ - _tmp13_) <= 1.0) {
 #line 1108 "page-view.c"
 		gdouble _tmp14_ = 0.0;
 		gdouble _tmp15_ = 0.0;
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp14_ = r;
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp15_ = l;
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp11_ = ((gint) _tmp14_) == ((gint) _tmp15_);
 #line 1117 "page-view.c"
 	} else {
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp11_ = FALSE;
 #line 1121 "page-view.c"
 	}
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp11_) {
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp10_ = TRUE;
 #line 1127 "page-view.c"
 	} else {
 		gboolean _tmp16_ = FALSE;
 		gdouble _tmp17_ = 0.0;
 		gdouble _tmp18_ = 0.0;
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp17_ = b;
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp18_ = t;
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if ((_tmp17_ - _tmp18_) <= 1.0) {
 #line 1138 "page-view.c"
 			gdouble _tmp19_ = 0.0;
 			gdouble _tmp20_ = 0.0;
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp19_ = b;
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp20_ = t;
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp16_ = ((gint) _tmp19_) == ((gint) _tmp20_);
 #line 1147 "page-view.c"
 		} else {
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp16_ = FALSE;
 #line 1151 "page-view.c"
 		}
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp10_ = _tmp16_;
 #line 1155 "page-view.c"
 	}
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp10_) {
 #line 1159 "page-view.c"
 		gboolean _tmp21_ = FALSE;
@@ -1184,27 +1184,27 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 		gdouble _tmp183_ = 0.0;
 		gdouble _tmp184_ = 0.0;
 		guchar _tmp185_ = '\0';
-#line 250 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp22_ = l;
-#line 250 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp23_ = r;
-#line 250 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (((gint) _tmp22_) == ((gint) _tmp23_)) {
-#line 250 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp21_ = TRUE;
 #line 1196 "page-view.c"
 		} else {
 			gdouble _tmp24_ = 0.0;
 			gdouble _tmp25_ = 0.0;
-#line 250 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp24_ = t;
-#line 250 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp25_ = b;
-#line 250 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp21_ = ((gint) _tmp24_) == ((gint) _tmp25_);
 #line 1206 "page-view.c"
 		}
-#line 250 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp21_) {
 #line 1210 "page-view.c"
 			guchar p[3] = {0};
@@ -1226,59 +1226,59 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 			gint _tmp38_ = 0;
 			guchar _tmp39_ = '\0';
 			guchar _tmp40_ = '\0';
-#line 253 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp26_ = page;
-#line 253 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp27_ = l;
-#line 253 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp28_ = t;
-#line 253 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			page_view_get_pixel (self, _tmp26_, (gint) _tmp27_, (gint) _tmp28_, p, 3);
-#line 254 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp29_ = output;
-#line 254 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp29__length1 = output_length1;
-#line 254 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp30_ = offset;
-#line 254 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp31_ = p[0];
-#line 254 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp29_[_tmp30_] = _tmp31_;
-#line 254 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp32_ = _tmp29_[_tmp30_];
-#line 255 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp33_ = output;
-#line 255 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp33__length1 = output_length1;
-#line 255 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp34_ = offset;
-#line 255 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp35_ = p[1];
-#line 255 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp33_[_tmp34_ + 1] = _tmp35_;
-#line 255 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp36_ = _tmp33_[_tmp34_ + 1];
-#line 256 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp37_ = output;
-#line 256 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp37__length1 = output_length1;
-#line 256 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp38_ = offset;
-#line 256 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp39_ = p[2];
-#line 256 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp37_[_tmp38_ + 2] = _tmp39_;
-#line 256 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp40_ = _tmp37_[_tmp38_ + 2];
-#line 257 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			return;
 #line 1276 "page-view.c"
 		}
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp41_ = L;
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp42_ = R;
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp41_ > _tmp42_) {
 #line 1284 "page-view.c"
 			guchar p[3] = {0};
@@ -1324,70 +1324,70 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 			gdouble _tmp102_ = 0.0;
 			gdouble _tmp103_ = 0.0;
 			gint _tmp104_ = 0;
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp43_ = page;
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp44_ = R;
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp45_ = T;
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			page_view_get_pixel (self, _tmp43_, _tmp44_, _tmp45_ - 1, p, 3);
-#line 265 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp46_ = red;
-#line 265 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp47_ = p[0];
-#line 265 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp48_ = r;
-#line 265 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp49_ = l;
-#line 265 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp50_ = T;
-#line 265 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp51_ = t;
-#line 265 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			red = _tmp46_ + ((_tmp47_ * (_tmp48_ - _tmp49_)) * (_tmp50_ - _tmp51_));
-#line 266 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp52_ = green;
-#line 266 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp53_ = p[1];
-#line 266 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp54_ = r;
-#line 266 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp55_ = l;
-#line 266 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp56_ = T;
-#line 266 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp57_ = t;
-#line 266 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			green = _tmp52_ + ((_tmp53_ * (_tmp54_ - _tmp55_)) * (_tmp56_ - _tmp57_));
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp58_ = blue;
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp59_ = p[2];
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp60_ = r;
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp61_ = l;
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp62_ = T;
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp63_ = t;
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			blue = _tmp58_ + ((_tmp59_ * (_tmp60_ - _tmp61_)) * (_tmp62_ - _tmp63_));
 #line 1378 "page-view.c"
 			{
 				gint y = 0;
 				gint _tmp64_ = 0;
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp64_ = T;
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y = _tmp64_;
 #line 1386 "page-view.c"
 				{
 					gboolean _tmp65_ = FALSE;
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp65_ = TRUE;
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					while (TRUE) {
 #line 1393 "page-view.c"
 						gint _tmp67_ = 0;
@@ -1407,119 +1407,119 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 						guchar _tmp81_ = '\0';
 						gdouble _tmp82_ = 0.0;
 						gdouble _tmp83_ = 0.0;
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						if (!_tmp65_) {
 #line 1413 "page-view.c"
 							gint _tmp66_ = 0;
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp66_ = y;
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							y = _tmp66_ + 1;
 #line 1419 "page-view.c"
 						}
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp65_ = FALSE;
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp67_ = y;
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp68_ = B;
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						if (!(_tmp67_ < _tmp68_)) {
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							break;
 #line 1431 "page-view.c"
 						}
-#line 270 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp69_ = page;
-#line 270 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp70_ = R;
-#line 270 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp71_ = y;
-#line 270 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						page_view_get_pixel (self, _tmp69_, _tmp70_, _tmp71_, p, 3);
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp72_ = red;
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp73_ = p[0];
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp74_ = r;
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp75_ = l;
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						red = _tmp72_ + (_tmp73_ * (_tmp74_ - _tmp75_));
-#line 272 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp76_ = green;
-#line 272 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp77_ = p[1];
-#line 272 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp78_ = r;
-#line 272 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp79_ = l;
-#line 272 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						green = _tmp76_ + (_tmp77_ * (_tmp78_ - _tmp79_));
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp80_ = blue;
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp81_ = p[2];
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp82_ = r;
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp83_ = l;
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						blue = _tmp80_ + (_tmp81_ * (_tmp82_ - _tmp83_));
 #line 1471 "page-view.c"
 					}
 				}
 			}
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp84_ = page;
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp85_ = R;
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp86_ = B;
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			page_view_get_pixel (self, _tmp84_, _tmp85_, _tmp86_, p, 3);
-#line 276 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp87_ = red;
-#line 276 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp88_ = p[0];
-#line 276 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp89_ = r;
-#line 276 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp90_ = l;
-#line 276 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp91_ = b;
-#line 276 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp92_ = B;
-#line 276 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			red = _tmp87_ + ((_tmp88_ * (_tmp89_ - _tmp90_)) * (_tmp91_ - _tmp92_));
-#line 277 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp93_ = green;
-#line 277 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp94_ = p[1];
-#line 277 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp95_ = r;
-#line 277 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp96_ = l;
-#line 277 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp97_ = b;
-#line 277 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp98_ = B;
-#line 277 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			green = _tmp93_ + ((_tmp94_ * (_tmp95_ - _tmp96_)) * (_tmp97_ - _tmp98_));
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp99_ = blue;
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp100_ = p[2];
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp101_ = r;
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp102_ = l;
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp103_ = b;
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp104_ = B;
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			blue = _tmp99_ + ((_tmp100_ * (_tmp101_ - _tmp102_)) * (_tmp103_ - _tmp104_));
 #line 1525 "page-view.c"
 		} else {
@@ -1566,70 +1566,70 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 			gdouble _tmp164_ = 0.0;
 			gdouble _tmp165_ = 0.0;
 			gint _tmp166_ = 0;
-#line 284 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp105_ = page;
-#line 284 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp106_ = L;
-#line 284 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp107_ = B;
-#line 284 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			page_view_get_pixel (self, _tmp105_, _tmp106_ - 1, _tmp107_, p, 3);
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp108_ = red;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp109_ = p[0];
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp110_ = b;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp111_ = t;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp112_ = L;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp113_ = l;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			red = _tmp108_ + ((_tmp109_ * (_tmp110_ - _tmp111_)) * (_tmp112_ - _tmp113_));
-#line 286 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp114_ = green;
-#line 286 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp115_ = p[1];
-#line 286 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp116_ = b;
-#line 286 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp117_ = t;
-#line 286 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp118_ = L;
-#line 286 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp119_ = l;
-#line 286 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			green = _tmp114_ + ((_tmp115_ * (_tmp116_ - _tmp117_)) * (_tmp118_ - _tmp119_));
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp120_ = blue;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp121_ = p[2];
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp122_ = b;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp123_ = t;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp124_ = L;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp125_ = l;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			blue = _tmp120_ + ((_tmp121_ * (_tmp122_ - _tmp123_)) * (_tmp124_ - _tmp125_));
 #line 1620 "page-view.c"
 			{
 				gint x = 0;
 				gint _tmp126_ = 0;
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp126_ = L;
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x = _tmp126_;
 #line 1628 "page-view.c"
 				{
 					gboolean _tmp127_ = FALSE;
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp127_ = TRUE;
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					while (TRUE) {
 #line 1635 "page-view.c"
 						gint _tmp129_ = 0;
@@ -1649,230 +1649,230 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 						guchar _tmp143_ = '\0';
 						gdouble _tmp144_ = 0.0;
 						gdouble _tmp145_ = 0.0;
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						if (!_tmp127_) {
 #line 1655 "page-view.c"
 							gint _tmp128_ = 0;
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp128_ = x;
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							x = _tmp128_ + 1;
 #line 1661 "page-view.c"
 						}
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp127_ = FALSE;
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp129_ = x;
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp130_ = R;
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						if (!(_tmp129_ < _tmp130_)) {
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							break;
 #line 1673 "page-view.c"
 						}
-#line 289 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp131_ = page;
-#line 289 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp132_ = x;
-#line 289 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp133_ = B;
-#line 289 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						page_view_get_pixel (self, _tmp131_, _tmp132_, _tmp133_, p, 3);
-#line 290 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp134_ = red;
-#line 290 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp135_ = p[0];
-#line 290 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp136_ = b;
-#line 290 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp137_ = t;
-#line 290 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						red = _tmp134_ + (_tmp135_ * (_tmp136_ - _tmp137_));
-#line 291 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp138_ = green;
-#line 291 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp139_ = p[1];
-#line 291 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp140_ = b;
-#line 291 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp141_ = t;
-#line 291 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						green = _tmp138_ + (_tmp139_ * (_tmp140_ - _tmp141_));
-#line 292 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp142_ = blue;
-#line 292 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp143_ = p[2];
-#line 292 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp144_ = b;
-#line 292 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp145_ = t;
-#line 292 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						blue = _tmp142_ + (_tmp143_ * (_tmp144_ - _tmp145_));
 #line 1713 "page-view.c"
 					}
 				}
 			}
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp146_ = page;
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp147_ = R;
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp148_ = B;
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			page_view_get_pixel (self, _tmp146_, _tmp147_, _tmp148_, p, 3);
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp149_ = red;
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp150_ = p[0];
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp151_ = b;
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp152_ = t;
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp153_ = r;
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp154_ = R;
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			red = _tmp149_ + ((_tmp150_ * (_tmp151_ - _tmp152_)) * (_tmp153_ - _tmp154_));
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp155_ = green;
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp156_ = p[1];
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp157_ = b;
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp158_ = t;
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp159_ = r;
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp160_ = R;
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			green = _tmp155_ + ((_tmp156_ * (_tmp157_ - _tmp158_)) * (_tmp159_ - _tmp160_));
-#line 297 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp161_ = blue;
-#line 297 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp162_ = p[2];
-#line 297 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp163_ = b;
-#line 297 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp164_ = t;
-#line 297 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp165_ = r;
-#line 297 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp166_ = R;
-#line 297 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			blue = _tmp161_ + ((_tmp162_ * (_tmp163_ - _tmp164_)) * (_tmp165_ - _tmp166_));
 #line 1767 "page-view.c"
 		}
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp167_ = r;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp168_ = l;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp169_ = b;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp170_ = t;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		scale = 1.0 / ((_tmp167_ - _tmp168_) * (_tmp169_ - _tmp170_));
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp171_ = output;
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp171__length1 = output_length1;
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp172_ = offset;
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp173_ = red;
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp174_ = scale;
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp171_[_tmp172_] = (guchar) ((_tmp173_ * _tmp174_) + 0.5);
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp175_ = _tmp171_[_tmp172_];
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp176_ = output;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp176__length1 = output_length1;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp177_ = offset;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp178_ = green;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp179_ = scale;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp176_[_tmp177_ + 1] = (guchar) ((_tmp178_ * _tmp179_) + 0.5);
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp180_ = _tmp176_[_tmp177_ + 1];
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp181_ = output;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp181__length1 = output_length1;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp182_ = offset;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp183_ = blue;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp184_ = scale;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp181_[_tmp182_ + 2] = (guchar) ((_tmp183_ * _tmp184_) + 0.5);
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp185_ = _tmp181_[_tmp182_ + 2];
-#line 304 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
 #line 1823 "page-view.c"
 	}
 	{
 		gint x = 0;
 		gint _tmp186_ = 0;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp186_ = L;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		x = _tmp186_;
 #line 1832 "page-view.c"
 		{
 			gboolean _tmp187_ = FALSE;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp187_ = TRUE;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			while (TRUE) {
 #line 1839 "page-view.c"
 				gint _tmp189_ = 0;
 				gint _tmp190_ = 0;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!_tmp187_) {
 #line 1844 "page-view.c"
 					gint _tmp188_ = 0;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp188_ = x;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					x = _tmp188_ + 1;
 #line 1850 "page-view.c"
 				}
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp187_ = FALSE;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp189_ = x;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp190_ = R;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!(_tmp189_ < _tmp190_)) {
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					break;
 #line 1862 "page-view.c"
 				}
 				{
 					gint y = 0;
 					gint _tmp191_ = 0;
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp191_ = T;
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					y = _tmp191_;
 #line 1871 "page-view.c"
 					{
 						gboolean _tmp192_ = FALSE;
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp192_ = TRUE;
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						while (TRUE) {
 #line 1878 "page-view.c"
 							gint _tmp194_ = 0;
@@ -1887,53 +1887,53 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 							guchar _tmp202_ = '\0';
 							gdouble _tmp203_ = 0.0;
 							guchar _tmp204_ = '\0';
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							if (!_tmp192_) {
 #line 1893 "page-view.c"
 								gint _tmp193_ = 0;
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp193_ = y;
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								y = _tmp193_ + 1;
 #line 1899 "page-view.c"
 							}
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp192_ = FALSE;
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp194_ = y;
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp195_ = B;
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							if (!(_tmp194_ < _tmp195_)) {
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								break;
 #line 1911 "page-view.c"
 							}
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp196_ = page;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp197_ = x;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp198_ = y;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							page_view_get_pixel (self, _tmp196_, _tmp197_, _tmp198_, p, 3);
-#line 314 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp199_ = red;
-#line 314 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp200_ = p[0];
-#line 314 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							red = _tmp199_ + _tmp200_;
-#line 315 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp201_ = green;
-#line 315 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp202_ = p[1];
-#line 315 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							green = _tmp201_ + _tmp202_;
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp203_ = blue;
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp204_ = p[2];
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							blue = _tmp203_ + _tmp204_;
 #line 1939 "page-view.c"
 						}
@@ -1945,16 +1945,16 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 	{
 		gint x = 0;
 		gint _tmp205_ = 0;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp205_ = L;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		x = _tmp205_;
 #line 1953 "page-view.c"
 		{
 			gboolean _tmp206_ = FALSE;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp206_ = TRUE;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			while (TRUE) {
 #line 1960 "page-view.c"
 				gint _tmp208_ = 0;
@@ -1963,33 +1963,33 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 				gint _tmp211_ = 0;
 				gdouble _tmp227_ = 0.0;
 				gint _tmp228_ = 0;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!_tmp206_) {
 #line 1969 "page-view.c"
 					gint _tmp207_ = 0;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp207_ = x;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					x = _tmp207_ + 1;
 #line 1975 "page-view.c"
 				}
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp206_ = FALSE;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp208_ = x;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp209_ = R;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!(_tmp208_ < _tmp209_)) {
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					break;
 #line 1987 "page-view.c"
 				}
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp210_ = t;
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp211_ = T;
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (_tmp210_ != ((gdouble) _tmp211_)) {
 #line 1995 "page-view.c"
 					guchar p[3] = {0};
@@ -2008,51 +2008,51 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 					guchar _tmp224_ = '\0';
 					gint _tmp225_ = 0;
 					gdouble _tmp226_ = 0.0;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp212_ = page;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp213_ = x;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp214_ = T;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					page_view_get_pixel (self, _tmp212_, _tmp213_, _tmp214_ - 1, p, 3);
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp215_ = red;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp216_ = p[0];
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp217_ = T;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp218_ = t;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					red = _tmp215_ + (_tmp216_ * (_tmp217_ - _tmp218_));
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp219_ = green;
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp220_ = p[1];
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp221_ = T;
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp222_ = t;
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					green = _tmp219_ + (_tmp220_ * (_tmp221_ - _tmp222_));
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp223_ = blue;
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp224_ = p[2];
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp225_ = T;
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp226_ = t;
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					blue = _tmp223_ + (_tmp224_ * (_tmp225_ - _tmp226_));
 #line 2050 "page-view.c"
 				}
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp227_ = b;
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp228_ = B;
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (_tmp227_ != ((gdouble) _tmp228_)) {
 #line 2058 "page-view.c"
 					guchar p[3] = {0};
@@ -2071,43 +2071,43 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 					guchar _tmp241_ = '\0';
 					gdouble _tmp242_ = 0.0;
 					gint _tmp243_ = 0;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp229_ = page;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp230_ = x;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp231_ = B;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					page_view_get_pixel (self, _tmp229_, _tmp230_, _tmp231_, p, 3);
-#line 336 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp232_ = red;
-#line 336 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp233_ = p[0];
-#line 336 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp234_ = b;
-#line 336 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp235_ = B;
-#line 336 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					red = _tmp232_ + (_tmp233_ * (_tmp234_ - _tmp235_));
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp236_ = green;
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp237_ = p[1];
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp238_ = b;
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp239_ = B;
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					green = _tmp236_ + (_tmp237_ * (_tmp238_ - _tmp239_));
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp240_ = blue;
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp241_ = p[2];
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp242_ = b;
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp243_ = B;
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					blue = _tmp240_ + (_tmp241_ * (_tmp242_ - _tmp243_));
 #line 2113 "page-view.c"
 				}
@@ -2117,16 +2117,16 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 	{
 		gint y = 0;
 		gint _tmp244_ = 0;
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp244_ = T;
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		y = _tmp244_;
 #line 2125 "page-view.c"
 		{
 			gboolean _tmp245_ = FALSE;
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp245_ = TRUE;
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			while (TRUE) {
 #line 2132 "page-view.c"
 				gint _tmp247_ = 0;
@@ -2135,33 +2135,33 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 				gint _tmp250_ = 0;
 				gdouble _tmp266_ = 0.0;
 				gint _tmp267_ = 0;
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!_tmp245_) {
 #line 2141 "page-view.c"
 					gint _tmp246_ = 0;
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp246_ = y;
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					y = _tmp246_ + 1;
 #line 2147 "page-view.c"
 				}
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp245_ = FALSE;
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp247_ = y;
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp248_ = B;
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!(_tmp247_ < _tmp248_)) {
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					break;
 #line 2159 "page-view.c"
 				}
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp249_ = l;
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp250_ = L;
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (_tmp249_ != ((gdouble) _tmp250_)) {
 #line 2167 "page-view.c"
 					guchar p[3] = {0};
@@ -2180,51 +2180,51 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 					guchar _tmp263_ = '\0';
 					gint _tmp264_ = 0;
 					gdouble _tmp265_ = 0.0;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp251_ = page;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp252_ = L;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp253_ = y;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					page_view_get_pixel (self, _tmp251_, _tmp252_ - 1, _tmp253_, p, 3);
-#line 349 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp254_ = red;
-#line 349 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp255_ = p[0];
-#line 349 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp256_ = L;
-#line 349 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp257_ = l;
-#line 349 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					red = _tmp254_ + (_tmp255_ * (_tmp256_ - _tmp257_));
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp258_ = green;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp259_ = p[1];
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp260_ = L;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp261_ = l;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					green = _tmp258_ + (_tmp259_ * (_tmp260_ - _tmp261_));
-#line 351 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp262_ = blue;
-#line 351 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp263_ = p[2];
-#line 351 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp264_ = L;
-#line 351 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp265_ = l;
-#line 351 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					blue = _tmp262_ + (_tmp263_ * (_tmp264_ - _tmp265_));
 #line 2222 "page-view.c"
 				}
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp266_ = r;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp267_ = R;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (_tmp266_ != ((gdouble) _tmp267_)) {
 #line 2230 "page-view.c"
 					guchar p[3] = {0};
@@ -2243,71 +2243,71 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 					guchar _tmp280_ = '\0';
 					gdouble _tmp281_ = 0.0;
 					gint _tmp282_ = 0;
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp268_ = page;
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp269_ = R;
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp270_ = y;
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					page_view_get_pixel (self, _tmp268_, _tmp269_, _tmp270_, p, 3);
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp271_ = red;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp272_ = p[0];
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp273_ = r;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp274_ = R;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					red = _tmp271_ + (_tmp272_ * (_tmp273_ - _tmp274_));
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp275_ = green;
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp276_ = p[1];
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp277_ = r;
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp278_ = R;
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					green = _tmp275_ + (_tmp276_ * (_tmp277_ - _tmp278_));
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp279_ = blue;
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp280_ = p[2];
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp281_ = r;
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp282_ = R;
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					blue = _tmp279_ + (_tmp280_ * (_tmp281_ - _tmp282_));
 #line 2285 "page-view.c"
 				}
 			}
 		}
 	}
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp284_ = l;
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp285_ = L;
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp284_ != ((gdouble) _tmp285_)) {
 #line 2296 "page-view.c"
 		gdouble _tmp286_ = 0.0;
 		gint _tmp287_ = 0;
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp286_ = t;
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp287_ = T;
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp283_ = _tmp286_ != ((gdouble) _tmp287_);
 #line 2305 "page-view.c"
 	} else {
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp283_ = FALSE;
 #line 2309 "page-view.c"
 	}
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp283_) {
 #line 2313 "page-view.c"
 		guchar p[3] = {0};
@@ -2332,80 +2332,80 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 		gdouble _tmp306_ = 0.0;
 		gint _tmp307_ = 0;
 		gdouble _tmp308_ = 0.0;
-#line 368 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp288_ = page;
-#line 368 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp289_ = L;
-#line 368 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp290_ = T;
-#line 368 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_get_pixel (self, _tmp288_, _tmp289_ - 1, _tmp290_ - 1, p, 3);
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp291_ = red;
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp292_ = p[0];
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp293_ = L;
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp294_ = l;
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp295_ = T;
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp296_ = t;
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		red = _tmp291_ + ((_tmp292_ * (_tmp293_ - _tmp294_)) * (_tmp295_ - _tmp296_));
-#line 370 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp297_ = green;
-#line 370 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp298_ = p[1];
-#line 370 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp299_ = L;
-#line 370 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp300_ = l;
-#line 370 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp301_ = T;
-#line 370 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp302_ = t;
-#line 370 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		green = _tmp297_ + ((_tmp298_ * (_tmp299_ - _tmp300_)) * (_tmp301_ - _tmp302_));
-#line 371 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp303_ = blue;
-#line 371 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp304_ = p[2];
-#line 371 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp305_ = L;
-#line 371 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp306_ = l;
-#line 371 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp307_ = T;
-#line 371 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp308_ = t;
-#line 371 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		blue = _tmp303_ + ((_tmp304_ * (_tmp305_ - _tmp306_)) * (_tmp307_ - _tmp308_));
 #line 2386 "page-view.c"
 	}
-#line 373 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp310_ = r;
-#line 373 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp311_ = R;
-#line 373 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp310_ != ((gdouble) _tmp311_)) {
 #line 2394 "page-view.c"
 		gdouble _tmp312_ = 0.0;
 		gint _tmp313_ = 0;
-#line 373 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp312_ = t;
-#line 373 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp313_ = T;
-#line 373 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp309_ = _tmp312_ != ((gdouble) _tmp313_);
 #line 2403 "page-view.c"
 	} else {
-#line 373 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp309_ = FALSE;
 #line 2407 "page-view.c"
 	}
-#line 373 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp309_) {
 #line 2411 "page-view.c"
 		guchar p[3] = {0};
@@ -2430,80 +2430,80 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 		gint _tmp332_ = 0;
 		gint _tmp333_ = 0;
 		gdouble _tmp334_ = 0.0;
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp314_ = page;
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp315_ = R;
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp316_ = T;
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_get_pixel (self, _tmp314_, _tmp315_, _tmp316_ - 1, p, 3);
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp317_ = red;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp318_ = p[0];
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp319_ = r;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp320_ = R;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp321_ = T;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp322_ = t;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		red = _tmp317_ + ((_tmp318_ * (_tmp319_ - _tmp320_)) * (_tmp321_ - _tmp322_));
-#line 378 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp323_ = green;
-#line 378 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp324_ = p[1];
-#line 378 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp325_ = r;
-#line 378 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp326_ = R;
-#line 378 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp327_ = T;
-#line 378 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp328_ = t;
-#line 378 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		green = _tmp323_ + ((_tmp324_ * (_tmp325_ - _tmp326_)) * (_tmp327_ - _tmp328_));
-#line 379 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp329_ = blue;
-#line 379 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp330_ = p[2];
-#line 379 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp331_ = r;
-#line 379 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp332_ = R;
-#line 379 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp333_ = T;
-#line 379 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp334_ = t;
-#line 379 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		blue = _tmp329_ + ((_tmp330_ * (_tmp331_ - _tmp332_)) * (_tmp333_ - _tmp334_));
 #line 2484 "page-view.c"
 	}
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp336_ = r;
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp337_ = R;
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp336_ != ((gdouble) _tmp337_)) {
 #line 2492 "page-view.c"
 		gdouble _tmp338_ = 0.0;
 		gint _tmp339_ = 0;
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp338_ = b;
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp339_ = B;
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp335_ = _tmp338_ != ((gdouble) _tmp339_);
 #line 2501 "page-view.c"
 	} else {
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp335_ = FALSE;
 #line 2505 "page-view.c"
 	}
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp335_) {
 #line 2509 "page-view.c"
 		guchar p[3] = {0};
@@ -2528,80 +2528,80 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 		gint _tmp358_ = 0;
 		gdouble _tmp359_ = 0.0;
 		gint _tmp360_ = 0;
-#line 384 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp340_ = page;
-#line 384 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp341_ = R;
-#line 384 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp342_ = B;
-#line 384 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_get_pixel (self, _tmp340_, _tmp341_, _tmp342_, p, 3);
-#line 385 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp343_ = red;
-#line 385 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp344_ = p[0];
-#line 385 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp345_ = r;
-#line 385 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp346_ = R;
-#line 385 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp347_ = b;
-#line 385 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp348_ = B;
-#line 385 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		red = _tmp343_ + ((_tmp344_ * (_tmp345_ - _tmp346_)) * (_tmp347_ - _tmp348_));
-#line 386 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp349_ = green;
-#line 386 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp350_ = p[1];
-#line 386 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp351_ = r;
-#line 386 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp352_ = R;
-#line 386 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp353_ = b;
-#line 386 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp354_ = B;
-#line 386 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		green = _tmp349_ + ((_tmp350_ * (_tmp351_ - _tmp352_)) * (_tmp353_ - _tmp354_));
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp355_ = blue;
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp356_ = p[2];
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp357_ = r;
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp358_ = R;
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp359_ = b;
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp360_ = B;
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		blue = _tmp355_ + ((_tmp356_ * (_tmp357_ - _tmp358_)) * (_tmp359_ - _tmp360_));
 #line 2582 "page-view.c"
 	}
-#line 389 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp362_ = l;
-#line 389 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp363_ = L;
-#line 389 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp362_ != ((gdouble) _tmp363_)) {
 #line 2590 "page-view.c"
 		gdouble _tmp364_ = 0.0;
 		gint _tmp365_ = 0;
-#line 389 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp364_ = b;
-#line 389 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp365_ = B;
-#line 389 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp361_ = _tmp364_ != ((gdouble) _tmp365_);
 #line 2599 "page-view.c"
 	} else {
-#line 389 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp361_ = FALSE;
 #line 2603 "page-view.c"
 	}
-#line 389 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp361_) {
 #line 2607 "page-view.c"
 		guchar p[3] = {0};
@@ -2626,109 +2626,109 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 		gdouble _tmp384_ = 0.0;
 		gdouble _tmp385_ = 0.0;
 		gint _tmp386_ = 0;
-#line 392 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp366_ = page;
-#line 392 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp367_ = L;
-#line 392 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp368_ = B;
-#line 392 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_get_pixel (self, _tmp366_, _tmp367_ - 1, _tmp368_, p, 3);
-#line 393 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp369_ = red;
-#line 393 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp370_ = p[0];
-#line 393 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp371_ = L;
-#line 393 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp372_ = l;
-#line 393 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp373_ = b;
-#line 393 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp374_ = B;
-#line 393 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		red = _tmp369_ + ((_tmp370_ * (_tmp371_ - _tmp372_)) * (_tmp373_ - _tmp374_));
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp375_ = green;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp376_ = p[1];
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp377_ = L;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp378_ = l;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp379_ = b;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp380_ = B;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		green = _tmp375_ + ((_tmp376_ * (_tmp377_ - _tmp378_)) * (_tmp379_ - _tmp380_));
-#line 395 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp381_ = blue;
-#line 395 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp382_ = p[2];
-#line 395 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp383_ = L;
-#line 395 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp384_ = l;
-#line 395 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp385_ = b;
-#line 395 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp386_ = B;
-#line 395 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		blue = _tmp381_ + ((_tmp382_ * (_tmp383_ - _tmp384_)) * (_tmp385_ - _tmp386_));
 #line 2680 "page-view.c"
 	}
-#line 399 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp387_ = r;
-#line 399 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp388_ = l;
-#line 399 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp389_ = b;
-#line 399 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp390_ = t;
-#line 399 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	scale = 1.0 / ((_tmp387_ - _tmp388_) * (_tmp389_ - _tmp390_));
-#line 400 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp391_ = output;
-#line 400 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp391__length1 = output_length1;
-#line 400 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp392_ = offset;
-#line 400 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp393_ = red;
-#line 400 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp394_ = scale;
-#line 400 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp391_[_tmp392_] = (guchar) ((_tmp393_ * _tmp394_) + 0.5);
-#line 400 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp395_ = _tmp391_[_tmp392_];
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp396_ = output;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp396__length1 = output_length1;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp397_ = offset;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp398_ = green;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp399_ = scale;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp396_[_tmp397_ + 1] = (guchar) ((_tmp398_ * _tmp399_) + 0.5);
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp400_ = _tmp396_[_tmp397_ + 1];
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp401_ = output;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp401__length1 = output_length1;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp402_ = offset;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp403_ = blue;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp404_ = scale;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp401_[_tmp402_ + 2] = (guchar) ((_tmp403_ * _tmp404_) + 0.5);
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp405_ = _tmp401_[_tmp402_ + 2];
 #line 2734 "page-view.c"
 }
@@ -2777,31 +2777,31 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 	Page* _tmp79_ = NULL;
 	gboolean _tmp80_ = FALSE;
 	gboolean _tmp81_ = FALSE;
-#line 405 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 405 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (page != NULL);
-#line 408 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = page;
-#line 408 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = page_get_width (_tmp0_);
-#line 408 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = _tmp1_;
-#line 408 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	input_width = _tmp2_;
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = page;
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = page_get_height (_tmp3_);
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp5_ = _tmp4_;
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	input_height = _tmp5_;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp8_ = *output_image;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp8_ == NULL) {
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp7_ = TRUE;
 #line 2807 "page-view.c"
 	} else {
@@ -2809,21 +2809,21 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
 		gint _tmp12_ = 0;
-#line 414 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 414 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp9_ = *output_image;
-#line 414 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 414 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp10_ = gdk_pixbuf_get_width (_tmp9_);
-#line 414 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 414 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp11_ = _tmp10_;
-#line 414 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 414 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp12_ = output_width;
-#line 414 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 414 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp7_ = _tmp11_ != _tmp12_;
 #line 2823 "page-view.c"
 	}
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp7_) {
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp6_ = TRUE;
 #line 2829 "page-view.c"
 	} else {
@@ -2831,19 +2831,19 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 		gint _tmp14_ = 0;
 		gint _tmp15_ = 0;
 		gint _tmp16_ = 0;
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp13_ = *output_image;
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp14_ = gdk_pixbuf_get_height (_tmp13_);
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp15_ = _tmp14_;
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp16_ = output_height;
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp6_ = _tmp15_ != _tmp16_;
 #line 2845 "page-view.c"
 	}
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp6_) {
 #line 2849 "page-view.c"
 		gint _tmp17_ = 0;
@@ -2851,36 +2851,36 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 		GdkPixbuf* _tmp19_ = NULL;
 		gint _tmp20_ = 0;
 		gint _tmp21_ = 0;
-#line 417 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp17_ = output_width;
-#line 417 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp18_ = output_height;
-#line 417 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp19_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, _tmp17_, _tmp18_);
-#line 417 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_object_unref0 (*output_image);
-#line 417 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		*output_image = _tmp19_;
-#line 424 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		L = 0;
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp20_ = output_width;
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		R = _tmp20_ - 1;
-#line 426 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		T = 0;
-#line 427 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp21_ = output_height;
-#line 427 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		B = _tmp21_ - 1;
 #line 2877 "page-view.c"
 	} else {
 		ScanDirection _tmp22_ = 0;
-#line 432 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp22_ = scan_direction;
-#line 432 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		switch (_tmp22_) {
-#line 432 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_TOP_TO_BOTTOM:
 #line 2886 "page-view.c"
 			{
@@ -2891,33 +2891,33 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 				gint _tmp27_ = 0;
 				gint _tmp28_ = 0;
 				gint _tmp29_ = 0;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				L = 0;
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp23_ = output_width;
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				R = _tmp23_ - 1;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp24_ = old_scan_line;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp25_ = output_height;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp26_ = input_height;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				T = (gint) ((((gdouble) _tmp24_) * _tmp25_) / _tmp26_);
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp27_ = scan_line;
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp28_ = output_height;
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp29_ = input_height;
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				B = (gint) (((((gdouble) _tmp27_) * _tmp28_) / _tmp29_) + 0.5);
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
 #line 2919 "page-view.c"
 			}
-#line 432 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_LEFT_TO_RIGHT:
 #line 2923 "page-view.c"
 			{
@@ -2928,33 +2928,33 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 				gint _tmp34_ = 0;
 				gint _tmp35_ = 0;
 				gint _tmp36_ = 0;
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp30_ = old_scan_line;
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp31_ = output_width;
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp32_ = input_width;
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				L = (gint) ((((gdouble) _tmp30_) * _tmp31_) / _tmp32_);
-#line 442 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp33_ = scan_line;
-#line 442 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp34_ = output_width;
-#line 442 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp35_ = input_width;
-#line 442 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				R = (gint) (((((gdouble) _tmp33_) * _tmp34_) / _tmp35_) + 0.5);
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				T = 0;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp36_ = output_height;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				B = _tmp36_ - 1;
-#line 445 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 445 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
 #line 2956 "page-view.c"
 			}
-#line 432 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_BOTTOM_TO_TOP:
 #line 2960 "page-view.c"
 			{
@@ -2967,37 +2967,37 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 				gint _tmp43_ = 0;
 				gint _tmp44_ = 0;
 				gint _tmp45_ = 0;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				L = 0;
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp37_ = output_width;
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				R = _tmp37_ - 1;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp38_ = input_height;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp39_ = scan_line;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp40_ = output_height;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp41_ = input_height;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				T = (gint) ((((gdouble) (_tmp38_ - _tmp39_)) * _tmp40_) / _tmp41_);
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp42_ = input_height;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp43_ = old_scan_line;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp44_ = output_height;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp45_ = input_height;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				B = (gint) (((((gdouble) (_tmp42_ - _tmp43_)) * _tmp44_) / _tmp45_) + 0.5);
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
 #line 2999 "page-view.c"
 			}
-#line 432 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_RIGHT_TO_LEFT:
 #line 3003 "page-view.c"
 			{
@@ -3010,33 +3010,33 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 				gint _tmp52_ = 0;
 				gint _tmp53_ = 0;
 				gint _tmp54_ = 0;
-#line 453 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp46_ = input_width;
-#line 453 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp47_ = scan_line;
-#line 453 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp48_ = output_width;
-#line 453 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp49_ = input_width;
-#line 453 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				L = (gint) ((((gdouble) (_tmp46_ - _tmp47_)) * _tmp48_) / _tmp49_);
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp50_ = input_width;
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp51_ = old_scan_line;
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp52_ = output_width;
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp53_ = input_width;
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				R = (gint) (((((gdouble) (_tmp50_ - _tmp51_)) * _tmp52_) / _tmp53_) + 0.5);
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				T = 0;
-#line 456 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp54_ = output_height;
-#line 456 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				B = _tmp54_ - 1;
-#line 457 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
 #line 3042 "page-view.c"
 			}
@@ -3045,165 +3045,165 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 				gint _tmp55_ = 0;
 				gint _tmp56_ = 0;
 				gint _tmp57_ = 0;
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				T = 0;
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp55_ = T;
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				B = _tmp55_;
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp56_ = B;
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				R = _tmp56_;
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp57_ = R;
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				L = _tmp57_;
-#line 460 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
 #line 3065 "page-view.c"
 			}
 		}
 	}
-#line 465 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp58_ = R;
-#line 465 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp59_ = output_width;
-#line 465 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp58_ >= _tmp59_) {
 #line 3075 "page-view.c"
 		gint _tmp60_ = 0;
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp60_ = output_width;
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		R = _tmp60_ - 1;
 #line 3081 "page-view.c"
 	}
-#line 467 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp61_ = B;
-#line 467 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp62_ = output_height;
-#line 467 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp61_ >= _tmp62_) {
 #line 3089 "page-view.c"
 		gint _tmp63_ = 0;
-#line 468 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp63_ = output_height;
-#line 468 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		B = _tmp63_ - 1;
 #line 3095 "page-view.c"
 	}
-#line 470 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp64_ = L;
-#line 470 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (_tmp64_ >= 0);
-#line 471 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp65_ = R;
-#line 471 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp66_ = output_width;
-#line 471 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (_tmp65_ < _tmp66_);
-#line 472 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp67_ = T;
-#line 472 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (_tmp67_ >= 0);
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp68_ = B;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp69_ = output_height;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (_tmp68_ < _tmp69_);
-#line 474 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp70_ = *output_image;
-#line 474 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (_tmp70_ != NULL);
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp71_ = *output_image;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp72_ = gdk_pixbuf_get_pixels (_tmp71_);
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	output = _tmp72_;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	output_length1 = -1;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_output_size_ = output_length1;
-#line 477 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp73_ = *output_image;
-#line 477 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp74_ = gdk_pixbuf_get_rowstride (_tmp73_);
-#line 477 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp75_ = _tmp74_;
-#line 477 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	output_rowstride = _tmp75_;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp76_ = *output_image;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp77_ = gdk_pixbuf_get_n_channels (_tmp76_);
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp78_ = _tmp77_;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	output_n_channels = _tmp78_;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp79_ = page;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp80_ = page_get_has_data (_tmp79_);
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp81_ = _tmp80_;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (!_tmp81_) {
 #line 3155 "page-view.c"
 		{
 			gint x = 0;
 			gint _tmp82_ = 0;
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp82_ = L;
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			x = _tmp82_;
 #line 3163 "page-view.c"
 			{
 				gboolean _tmp83_ = FALSE;
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp83_ = TRUE;
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				while (TRUE) {
 #line 3170 "page-view.c"
 					gint _tmp85_ = 0;
 					gint _tmp86_ = 0;
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					if (!_tmp83_) {
 #line 3175 "page-view.c"
 						gint _tmp84_ = 0;
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp84_ = x;
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						x = _tmp84_ + 1;
 #line 3181 "page-view.c"
 					}
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp83_ = FALSE;
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp85_ = x;
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp86_ = R;
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					if (!(_tmp85_ <= _tmp86_)) {
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						break;
 #line 3193 "page-view.c"
 					}
 					{
 						gint y = 0;
 						gint _tmp87_ = 0;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp87_ = T;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						y = _tmp87_;
 #line 3202 "page-view.c"
 						{
 							gboolean _tmp88_ = FALSE;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp88_ = TRUE;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							while (TRUE) {
 #line 3209 "page-view.c"
 								gint _tmp90_ = 0;
@@ -3225,67 +3225,67 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 								guchar _tmp102_ = '\0';
 								guchar _tmp103_ = '\0';
 								guchar _tmp104_ = '\0';
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								if (!_tmp88_) {
 #line 3231 "page-view.c"
 									gint _tmp89_ = 0;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 									_tmp89_ = y;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 									y = _tmp89_ + 1;
 #line 3237 "page-view.c"
 								}
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp88_ = FALSE;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp90_ = y;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp91_ = B;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								if (!(_tmp90_ <= _tmp91_)) {
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 									break;
 #line 3249 "page-view.c"
 								}
-#line 485 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp92_ = output_rowstride;
-#line 485 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp93_ = y;
-#line 485 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp94_ = x;
-#line 485 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp95_ = output_n_channels;
-#line 485 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								o = (_tmp92_ * _tmp93_) + (_tmp94_ * _tmp95_);
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp96_ = output;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp96__length1 = output_length1;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp97_ = o;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp98_ = output;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp98__length1 = output_length1;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp99_ = o;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp100_ = output;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp100__length1 = output_length1;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp101_ = o;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp100_[_tmp101_ + 2] = (guchar) 0xFF;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp102_ = _tmp100_[_tmp101_ + 2];
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp98_[_tmp99_ + 1] = _tmp102_;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp103_ = _tmp98_[_tmp99_ + 1];
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp96_[_tmp97_] = _tmp103_;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp104_ = _tmp96_[_tmp97_];
 #line 3291 "page-view.c"
 							}
@@ -3294,23 +3294,23 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 				}
 			}
 		}
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
 #line 3300 "page-view.c"
 	}
 	{
 		gint x = 0;
 		gint _tmp105_ = 0;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp105_ = L;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		x = _tmp105_;
 #line 3309 "page-view.c"
 		{
 			gboolean _tmp106_ = FALSE;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp106_ = TRUE;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			while (TRUE) {
 #line 3316 "page-view.c"
 				gint _tmp108_ = 0;
@@ -3323,58 +3323,58 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 				gint _tmp113_ = 0;
 				gint _tmp114_ = 0;
 				gint _tmp115_ = 0;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!_tmp106_) {
 #line 3329 "page-view.c"
 					gint _tmp107_ = 0;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp107_ = x;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					x = _tmp107_ + 1;
 #line 3335 "page-view.c"
 				}
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp106_ = FALSE;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp108_ = x;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp109_ = R;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				if (!(_tmp108_ <= _tmp109_)) {
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					break;
 #line 3347 "page-view.c"
 				}
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp110_ = x;
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp111_ = input_width;
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp112_ = output_width;
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				l = (((gdouble) _tmp110_) * _tmp111_) / _tmp112_;
-#line 495 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp113_ = x;
-#line 495 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp114_ = input_width;
-#line 495 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp115_ = output_width;
-#line 495 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				r = (((gdouble) (_tmp113_ + 1)) * _tmp114_) / _tmp115_;
 #line 3365 "page-view.c"
 				{
 					gint y = 0;
 					gint _tmp116_ = 0;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp116_ = T;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					y = _tmp116_;
 #line 3373 "page-view.c"
 					{
 						gboolean _tmp117_ = FALSE;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp117_ = TRUE;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						while (TRUE) {
 #line 3380 "page-view.c"
 							gint _tmp119_ = 0;
@@ -3398,67 +3398,67 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 							gint _tmp134_ = 0;
 							gint _tmp135_ = 0;
 							gint _tmp136_ = 0;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							if (!_tmp117_) {
 #line 3404 "page-view.c"
 								gint _tmp118_ = 0;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								_tmp118_ = y;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								y = _tmp118_ + 1;
 #line 3410 "page-view.c"
 							}
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp117_ = FALSE;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp119_ = y;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp120_ = B;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							if (!(_tmp119_ <= _tmp120_)) {
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								break;
 #line 3422 "page-view.c"
 							}
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp121_ = y;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp122_ = input_height;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp123_ = output_height;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							t = (((gdouble) _tmp121_) * _tmp122_) / _tmp123_;
-#line 500 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp124_ = y;
-#line 500 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp125_ = input_height;
-#line 500 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp126_ = output_height;
-#line 500 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							b = (((gdouble) (_tmp124_ + 1)) * _tmp125_) / _tmp126_;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp127_ = page;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp128_ = l;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp129_ = r;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp130_ = t;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp131_ = b;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp132_ = output;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp132__length1 = output_length1;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp133_ = output_rowstride;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp134_ = y;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp135_ = x;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							_tmp136_ = output_n_channels;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							page_view_set_pixel (self, _tmp127_, _tmp128_, _tmp129_, _tmp130_, _tmp131_, _tmp132_, _tmp132__length1, (_tmp133_ * _tmp134_) + (_tmp135_ * _tmp136_));
 #line 3464 "page-view.c"
 						}
@@ -3474,15 +3474,15 @@ static gint page_view_get_preview_width (PageView* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 509 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->width_;
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->border_width;
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_ - (_tmp1_ * 2);
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
 #line 3488 "page-view.c"
 }
@@ -3492,15 +3492,15 @@ static gint page_view_get_preview_height (PageView* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 516 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->height_;
-#line 516 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->border_width;
-#line 516 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_ - (_tmp1_ * 2);
-#line 516 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
 #line 3506 "page-view.c"
 }
@@ -3533,93 +3533,93 @@ static void page_view_update_page_view (PageView* self) {
 	gint _tmp21_ = 0;
 	gint _tmp22_ = 0;
 	gint _tmp23_ = 0;
-#line 519 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 521 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->update_image;
-#line 521 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (!_tmp0_) {
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
 #line 3545 "page-view.c"
 	}
-#line 524 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->scan_line;
-#line 524 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	old_scan_line = _tmp1_;
-#line 525 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = self->priv->_page;
-#line 525 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = page_get_scan_line (_tmp2_);
-#line 525 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = _tmp3_;
-#line 525 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	scan_line = _tmp4_;
-#line 528 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp5_ = self->priv->scan_direction;
-#line 528 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = self->priv->_page;
-#line 528 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp7_ = page_get_scan_direction (_tmp6_);
-#line 528 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp8_ = _tmp7_;
-#line 528 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	left_steps = _tmp5_ - _tmp8_;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp10_ = left_steps;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp10_ != 0) {
 #line 3573 "page-view.c"
 		GdkPixbuf* _tmp11_ = NULL;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp11_ = self->priv->image;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp9_ = _tmp11_ != NULL;
 #line 3579 "page-view.c"
 	} else {
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp9_ = FALSE;
 #line 3583 "page-view.c"
 	}
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp9_) {
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_object_unref0 (self->priv->image);
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->image = NULL;
 #line 3591 "page-view.c"
 	}
-#line 531 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp12_ = self->priv->_page;
-#line 531 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp13_ = page_get_scan_direction (_tmp12_);
-#line 531 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp14_ = _tmp13_;
-#line 531 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->scan_direction = _tmp14_;
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp15_ = self->priv->_page;
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp16_ = page_view_get_preview_width (self);
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp17_ = page_view_get_preview_height (self);
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp18_ = self->priv->_page;
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp19_ = page_get_scan_direction (_tmp18_);
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp20_ = _tmp19_;
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp21_ = old_scan_line;
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp22_ = scan_line;
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_update_preview (self, _tmp15_, &self->priv->image, _tmp16_, _tmp17_, _tmp20_, _tmp21_, _tmp22_);
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = FALSE;
-#line 540 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp23_ = scan_line;
-#line 540 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->scan_line = _tmp23_;
 #line 3625 "page-view.c"
 }
@@ -3632,21 +3632,21 @@ static gint page_view_page_to_screen_x (PageView* self, gint x) {
 	Page* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = x;
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = page_view_get_preview_width (self);
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = self->priv->_page;
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = page_get_width (_tmp2_);
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = _tmp3_;
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = (gint) (((((gdouble) _tmp0_) * _tmp1_) / _tmp4_) + 0.5);
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
 #line 3652 "page-view.c"
 }
@@ -3659,21 +3659,21 @@ static gint page_view_page_to_screen_y (PageView* self, gint y) {
 	Page* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = y;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = page_view_get_preview_height (self);
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = self->priv->_page;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = page_get_height (_tmp2_);
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = _tmp3_;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = (gint) (((((gdouble) _tmp0_) * _tmp1_) / _tmp4_) + 0.5);
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
 #line 3679 "page-view.c"
 }
@@ -3686,21 +3686,21 @@ static gint page_view_screen_to_page_x (PageView* self, gint x) {
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
-#line 553 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = x;
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->_page;
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_get_width (_tmp1_);
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = _tmp2_;
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = page_view_get_preview_width (self);
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = (gint) (((((gdouble) _tmp0_) * _tmp3_) / _tmp4_) + 0.5);
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
 #line 3706 "page-view.c"
 }
@@ -3713,21 +3713,21 @@ static gint page_view_screen_to_page_y (PageView* self, gint y) {
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
-#line 558 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 560 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = y;
-#line 560 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->_page;
-#line 560 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_get_height (_tmp1_);
-#line 560 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = _tmp2_;
-#line 560 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = page_view_get_preview_height (self);
-#line 560 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = (gint) (((((gdouble) _tmp0_) * _tmp3_) / _tmp4_) + 0.5);
-#line 560 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
 #line 3733 "page-view.c"
 }
@@ -3811,396 +3811,396 @@ static CropLocation page_view_get_crop_location (PageView* self, gint x, gint y)
 	gint _tmp78_ = 0;
 	gint _tmp79_ = 0;
 	gint _tmp80_ = 0;
-#line 563 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->_page;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = page_get_has_crop (_tmp0_);
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = _tmp1_;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (!_tmp2_) {
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = 0;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
 #line 3829 "page-view.c"
 	}
-#line 568 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = self->priv->_page;
-#line 568 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = page_get_crop_x (_tmp3_);
-#line 568 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp5_ = _tmp4_;
-#line 568 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cx = _tmp5_;
-#line 569 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = self->priv->_page;
-#line 569 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp7_ = page_get_crop_y (_tmp6_);
-#line 569 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp8_ = _tmp7_;
-#line 569 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cy = _tmp8_;
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp9_ = self->priv->_page;
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp10_ = page_get_crop_width (_tmp9_);
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp11_ = _tmp10_;
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cw = _tmp11_;
-#line 571 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp12_ = self->priv->_page;
-#line 571 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp13_ = page_get_crop_height (_tmp12_);
-#line 571 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp14_ = _tmp13_;
-#line 571 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	ch = _tmp14_;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp15_ = cx;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp16_ = page_view_page_to_screen_x (self, _tmp15_);
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	dx = _tmp16_;
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp17_ = cy;
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp18_ = page_view_page_to_screen_y (self, _tmp17_);
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	dy = _tmp18_;
-#line 574 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp19_ = cw;
-#line 574 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp20_ = page_view_page_to_screen_x (self, _tmp19_);
-#line 574 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	dw = _tmp20_;
-#line 575 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp21_ = ch;
-#line 575 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp22_ = page_view_page_to_screen_y (self, _tmp21_);
-#line 575 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	dh = _tmp22_;
-#line 576 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp23_ = x;
-#line 576 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp24_ = dx;
-#line 576 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	ix = _tmp23_ - _tmp24_;
-#line 577 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp25_ = y;
-#line 577 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp26_ = dy;
-#line 577 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	iy = _tmp25_ - _tmp26_;
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp30_ = ix;
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp30_ < 0) {
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp29_ = TRUE;
 #line 3905 "page-view.c"
 	} else {
 		gint _tmp31_ = 0;
 		gint _tmp32_ = 0;
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp31_ = ix;
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp32_ = dw;
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp29_ = _tmp31_ > _tmp32_;
 #line 3915 "page-view.c"
 	}
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp29_) {
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp28_ = TRUE;
 #line 3921 "page-view.c"
 	} else {
 		gint _tmp33_ = 0;
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp33_ = iy;
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp28_ = _tmp33_ < 0;
 #line 3928 "page-view.c"
 	}
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp28_) {
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp27_ = TRUE;
 #line 3934 "page-view.c"
 	} else {
 		gint _tmp34_ = 0;
 		gint _tmp35_ = 0;
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp34_ = iy;
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp35_ = dh;
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp27_ = _tmp34_ > _tmp35_;
 #line 3944 "page-view.c"
 	}
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp27_) {
-#line 580 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_NONE;
-#line 580 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
 #line 3952 "page-view.c"
 	}
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp36_ = self->priv->_page;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp37_ = page_get_crop_name (_tmp36_);
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp38_ = _tmp37_;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp39_ = g_strdup (_tmp38_);
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	name = _tmp39_;
-#line 584 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp40_ = name;
-#line 584 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp40_ != NULL) {
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_MIDDLE;
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
 #line 3974 "page-view.c"
 	}
-#line 588 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	crop_border = 20;
-#line 589 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp41_ = dw;
-#line 589 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp42_ = crop_border;
-#line 589 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp41_ < (_tmp42_ * 3)) {
 #line 3984 "page-view.c"
 		gint _tmp43_ = 0;
-#line 590 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp43_ = dw;
-#line 590 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		crop_border = _tmp43_ / 3;
 #line 3990 "page-view.c"
 	}
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp44_ = dh;
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp45_ = crop_border;
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp44_ < (_tmp45_ * 3)) {
 #line 3998 "page-view.c"
 		gint _tmp46_ = 0;
-#line 592 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp46_ = dh;
-#line 592 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		crop_border = _tmp46_ / 3;
 #line 4004 "page-view.c"
 	}
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp48_ = ix;
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp49_ = crop_border;
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp48_ < _tmp49_) {
 #line 4012 "page-view.c"
 		gint _tmp50_ = 0;
 		gint _tmp51_ = 0;
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp50_ = iy;
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp51_ = crop_border;
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp47_ = _tmp50_ < _tmp51_;
 #line 4021 "page-view.c"
 	} else {
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp47_ = FALSE;
 #line 4025 "page-view.c"
 	}
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp47_) {
-#line 596 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_TOP_LEFT;
-#line 596 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 596 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
 #line 4035 "page-view.c"
 	}
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp53_ = ix;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp54_ = dw;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp55_ = crop_border;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp53_ > (_tmp54_ - _tmp55_)) {
 #line 4045 "page-view.c"
 		gint _tmp56_ = 0;
 		gint _tmp57_ = 0;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp56_ = iy;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp57_ = crop_border;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp52_ = _tmp56_ < _tmp57_;
 #line 4054 "page-view.c"
 	} else {
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp52_ = FALSE;
 #line 4058 "page-view.c"
 	}
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp52_) {
-#line 599 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_TOP_RIGHT;
-#line 599 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 599 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
 #line 4068 "page-view.c"
 	}
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp59_ = ix;
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp60_ = crop_border;
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp59_ < _tmp60_) {
 #line 4076 "page-view.c"
 		gint _tmp61_ = 0;
 		gint _tmp62_ = 0;
 		gint _tmp63_ = 0;
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp61_ = iy;
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp62_ = dh;
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp63_ = crop_border;
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp58_ = _tmp61_ > (_tmp62_ - _tmp63_);
 #line 4088 "page-view.c"
 	} else {
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp58_ = FALSE;
 #line 4092 "page-view.c"
 	}
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp58_) {
-#line 602 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_BOTTOM_LEFT;
-#line 602 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 602 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
 #line 4102 "page-view.c"
 	}
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp65_ = ix;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp66_ = dw;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp67_ = crop_border;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp65_ > (_tmp66_ - _tmp67_)) {
 #line 4112 "page-view.c"
 		gint _tmp68_ = 0;
 		gint _tmp69_ = 0;
 		gint _tmp70_ = 0;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp68_ = iy;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp69_ = dh;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp70_ = crop_border;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp64_ = _tmp68_ > (_tmp69_ - _tmp70_);
 #line 4124 "page-view.c"
 	} else {
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp64_ = FALSE;
 #line 4128 "page-view.c"
 	}
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp64_) {
-#line 605 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_BOTTOM_RIGHT;
-#line 605 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 605 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
 #line 4138 "page-view.c"
 	}
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp71_ = ix;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp72_ = crop_border;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp71_ < _tmp72_) {
-#line 609 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_LEFT;
-#line 609 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 609 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
 #line 4152 "page-view.c"
 	}
-#line 611 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp73_ = ix;
-#line 611 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp74_ = dw;
-#line 611 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp75_ = crop_border;
-#line 611 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp73_ > (_tmp74_ - _tmp75_)) {
-#line 612 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_RIGHT;
-#line 612 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 612 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
 #line 4168 "page-view.c"
 	}
-#line 614 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp76_ = iy;
-#line 614 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp77_ = crop_border;
-#line 614 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 614 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp76_ < _tmp77_) {
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_TOP;
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
 #line 4182 "page-view.c"
 	}
-#line 617 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp78_ = iy;
-#line 617 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp79_ = dh;
-#line 617 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp80_ = crop_border;
-#line 617 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp78_ > (_tmp79_ - _tmp80_)) {
-#line 618 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_BOTTOM;
-#line 618 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
-#line 618 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
 #line 4198 "page-view.c"
 	}
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = CROP_LOCATION_MIDDLE;
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_g_free0 (name);
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
 #line 4206 "page-view.c"
 }
@@ -4212,19 +4212,19 @@ void page_view_button_press (PageView* self, gint x, gint y) {
 	gint _tmp1_ = 0;
 	CropLocation _tmp2_ = 0;
 	CropLocation _tmp3_ = 0;
-#line 624 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = x;
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = y;
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_view_get_crop_location (self, _tmp0_, _tmp1_);
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	location = _tmp2_;
-#line 628 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = location;
-#line 628 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp3_ != CROP_LOCATION_NONE) {
 #line 4230 "page-view.c"
 		CropLocation _tmp4_ = 0;
@@ -4242,49 +4242,49 @@ void page_view_button_press (PageView* self, gint x, gint y) {
 		Page* _tmp16_ = NULL;
 		gint _tmp17_ = 0;
 		gint _tmp18_ = 0;
-#line 630 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp4_ = location;
-#line 630 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->crop_location = _tmp4_;
-#line 631 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp5_ = x;
-#line 631 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->selected_crop_px = (gdouble) _tmp5_;
-#line 632 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp6_ = y;
-#line 632 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->selected_crop_py = (gdouble) _tmp6_;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp7_ = self->priv->_page;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp8_ = page_get_crop_x (_tmp7_);
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp9_ = _tmp8_;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->selected_crop_x = _tmp9_;
-#line 634 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp10_ = self->priv->_page;
-#line 634 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp11_ = page_get_crop_y (_tmp10_);
-#line 634 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp12_ = _tmp11_;
-#line 634 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->selected_crop_y = _tmp12_;
-#line 635 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp13_ = self->priv->_page;
-#line 635 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp14_ = page_get_crop_width (_tmp13_);
-#line 635 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp15_ = _tmp14_;
-#line 635 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->selected_crop_w = _tmp15_;
-#line 636 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp16_ = self->priv->_page;
-#line 636 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp17_ = page_get_crop_height (_tmp16_);
-#line 636 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp18_ = _tmp17_;
-#line 636 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->selected_crop_h = _tmp18_;
 #line 4290 "page-view.c"
 	}
@@ -4365,230 +4365,230 @@ void page_view_motion (PageView* self, gint x, gint y) {
 	gboolean _tmp150_ = FALSE;
 	gint _tmp151_ = 0;
 	gint _tmp152_ = 0;
-#line 640 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 642 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = x;
-#line 642 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = y;
-#line 642 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_view_get_crop_location (self, _tmp0_, _tmp1_);
-#line 642 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	location = _tmp2_;
-#line 644 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = location;
-#line 644 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	switch (_tmp3_) {
-#line 644 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_MIDDLE:
 #line 4385 "page-view.c"
 		{
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_HAND1;
-#line 648 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
 #line 4391 "page-view.c"
 		}
-#line 644 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_TOP:
 #line 4395 "page-view.c"
 		{
-#line 650 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_TOP_SIDE;
-#line 651 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
 #line 4401 "page-view.c"
 		}
-#line 644 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_BOTTOM:
 #line 4405 "page-view.c"
 		{
-#line 653 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_BOTTOM_SIDE;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
 #line 4411 "page-view.c"
 		}
-#line 644 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_LEFT:
 #line 4415 "page-view.c"
 		{
-#line 656 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_LEFT_SIDE;
-#line 657 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
 #line 4421 "page-view.c"
 		}
-#line 644 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_RIGHT:
 #line 4425 "page-view.c"
 		{
-#line 659 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_RIGHT_SIDE;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
 #line 4431 "page-view.c"
 		}
-#line 644 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_TOP_LEFT:
 #line 4435 "page-view.c"
 		{
-#line 662 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_TOP_LEFT_CORNER;
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
 #line 4441 "page-view.c"
 		}
-#line 644 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_TOP_RIGHT:
 #line 4445 "page-view.c"
 		{
-#line 665 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_TOP_RIGHT_CORNER;
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
 #line 4451 "page-view.c"
 		}
-#line 644 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_BOTTOM_LEFT:
 #line 4455 "page-view.c"
 		{
-#line 668 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_BOTTOM_LEFT_CORNER;
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
 #line 4461 "page-view.c"
 		}
-#line 644 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_BOTTOM_RIGHT:
 #line 4465 "page-view.c"
 		{
-#line 671 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_BOTTOM_RIGHT_CORNER;
-#line 672 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
 #line 4471 "page-view.c"
 		}
 		default:
 		{
-#line 674 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_ARROW;
-#line 675 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
 #line 4479 "page-view.c"
 		}
 	}
-#line 678 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = self->priv->crop_location;
-#line 678 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp4_ == CROP_LOCATION_NONE) {
 #line 4486 "page-view.c"
 		GdkCursorType _tmp5_ = 0;
-#line 680 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp5_ = cursor;
-#line 680 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_set_cursor (self, _tmp5_);
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
 #line 4494 "page-view.c"
 	}
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = self->priv->_page;
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp7_ = page_get_width (_tmp6_);
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp8_ = _tmp7_;
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	pw = _tmp8_;
-#line 686 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp9_ = self->priv->_page;
-#line 686 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp10_ = page_get_height (_tmp9_);
-#line 686 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp11_ = _tmp10_;
-#line 686 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	ph = _tmp11_;
-#line 687 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp12_ = self->priv->_page;
-#line 687 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp13_ = page_get_crop_width (_tmp12_);
-#line 687 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp14_ = _tmp13_;
-#line 687 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cw = _tmp14_;
-#line 688 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp15_ = self->priv->_page;
-#line 688 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp16_ = page_get_crop_height (_tmp15_);
-#line 688 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp17_ = _tmp16_;
-#line 688 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	ch = _tmp17_;
-#line 690 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp18_ = x;
-#line 690 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp19_ = self->priv->selected_crop_px;
-#line 690 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp20_ = page_view_screen_to_page_x (self, _tmp18_ - ((gint) _tmp19_));
-#line 690 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	dx = _tmp20_;
-#line 691 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp21_ = y;
-#line 691 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp22_ = self->priv->selected_crop_py;
-#line 691 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp23_ = page_view_screen_to_page_y (self, _tmp21_ - ((gint) _tmp22_));
-#line 691 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 691 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	dy = _tmp23_;
-#line 693 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp24_ = self->priv->selected_crop_x;
-#line 693 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	new_x = _tmp24_;
-#line 694 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp25_ = self->priv->selected_crop_y;
-#line 694 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	new_y = _tmp25_;
-#line 695 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp26_ = self->priv->selected_crop_w;
-#line 695 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	new_w = _tmp26_;
-#line 696 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp27_ = self->priv->selected_crop_h;
-#line 696 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	new_h = _tmp27_;
-#line 699 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp28_ = page_view_screen_to_page_x (self, 15);
-#line 699 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	min_size = _tmp28_;
-#line 700 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp31_ = self->priv->crop_location;
-#line 700 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp31_ == CROP_LOCATION_TOP_LEFT) {
-#line 700 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp30_ = TRUE;
 #line 4570 "page-view.c"
 	} else {
 		CropLocation _tmp32_ = 0;
-#line 701 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp32_ = self->priv->crop_location;
-#line 701 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp30_ = _tmp32_ == CROP_LOCATION_LEFT;
 #line 4577 "page-view.c"
 	}
-#line 700 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp30_) {
-#line 700 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp29_ = TRUE;
 #line 4583 "page-view.c"
 	} else {
 		CropLocation _tmp33_ = 0;
-#line 702 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp33_ = self->priv->crop_location;
-#line 702 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp29_ = _tmp33_ == CROP_LOCATION_BOTTOM_LEFT;
 #line 4590 "page-view.c"
 	}
-#line 700 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp29_) {
 #line 4594 "page-view.c"
 		gint _tmp34_ = 0;
@@ -4596,69 +4596,69 @@ void page_view_motion (PageView* self, gint x, gint y) {
 		gint _tmp36_ = 0;
 		gint _tmp39_ = 0;
 		gint _tmp40_ = 0;
-#line 704 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp34_ = dx;
-#line 704 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp35_ = new_w;
-#line 704 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp36_ = min_size;
-#line 704 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp34_ > (_tmp35_ - _tmp36_)) {
 #line 4608 "page-view.c"
 			gint _tmp37_ = 0;
 			gint _tmp38_ = 0;
-#line 705 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp37_ = new_w;
-#line 705 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp38_ = min_size;
-#line 705 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dx = _tmp37_ - _tmp38_;
 #line 4617 "page-view.c"
 		}
-#line 706 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp39_ = new_x;
-#line 706 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp40_ = dx;
-#line 706 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if ((_tmp39_ + _tmp40_) < 0) {
 #line 4625 "page-view.c"
 			gint _tmp41_ = 0;
-#line 707 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp41_ = new_x;
-#line 707 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dx = -_tmp41_;
 #line 4631 "page-view.c"
 		}
 	}
-#line 709 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp44_ = self->priv->crop_location;
-#line 709 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp44_ == CROP_LOCATION_TOP_LEFT) {
-#line 709 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp43_ = TRUE;
 #line 4640 "page-view.c"
 	} else {
 		CropLocation _tmp45_ = 0;
-#line 710 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp45_ = self->priv->crop_location;
-#line 710 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp43_ = _tmp45_ == CROP_LOCATION_TOP;
 #line 4647 "page-view.c"
 	}
-#line 709 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp43_) {
-#line 709 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp42_ = TRUE;
 #line 4653 "page-view.c"
 	} else {
 		CropLocation _tmp46_ = 0;
-#line 711 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp46_ = self->priv->crop_location;
-#line 711 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp42_ = _tmp46_ == CROP_LOCATION_TOP_RIGHT;
 #line 4660 "page-view.c"
 	}
-#line 709 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp42_) {
 #line 4664 "page-view.c"
 		gint _tmp47_ = 0;
@@ -4666,69 +4666,69 @@ void page_view_motion (PageView* self, gint x, gint y) {
 		gint _tmp49_ = 0;
 		gint _tmp52_ = 0;
 		gint _tmp53_ = 0;
-#line 713 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp47_ = dy;
-#line 713 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp48_ = new_h;
-#line 713 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp49_ = min_size;
-#line 713 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp47_ > (_tmp48_ - _tmp49_)) {
 #line 4678 "page-view.c"
 			gint _tmp50_ = 0;
 			gint _tmp51_ = 0;
-#line 714 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp50_ = new_h;
-#line 714 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp51_ = min_size;
-#line 714 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dy = _tmp50_ - _tmp51_;
 #line 4687 "page-view.c"
 		}
-#line 715 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp52_ = new_y;
-#line 715 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp53_ = dy;
-#line 715 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if ((_tmp52_ + _tmp53_) < 0) {
 #line 4695 "page-view.c"
 			gint _tmp54_ = 0;
-#line 716 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp54_ = new_y;
-#line 716 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dy = -_tmp54_;
 #line 4701 "page-view.c"
 		}
 	}
-#line 719 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp57_ = self->priv->crop_location;
-#line 719 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp57_ == CROP_LOCATION_TOP_RIGHT) {
-#line 719 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp56_ = TRUE;
 #line 4710 "page-view.c"
 	} else {
 		CropLocation _tmp58_ = 0;
-#line 720 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp58_ = self->priv->crop_location;
-#line 720 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp56_ = _tmp58_ == CROP_LOCATION_RIGHT;
 #line 4717 "page-view.c"
 	}
-#line 719 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp56_) {
-#line 719 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp55_ = TRUE;
 #line 4723 "page-view.c"
 	} else {
 		CropLocation _tmp59_ = 0;
-#line 721 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp59_ = self->priv->crop_location;
-#line 721 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp55_ = _tmp59_ == CROP_LOCATION_BOTTOM_RIGHT;
 #line 4730 "page-view.c"
 	}
-#line 719 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp55_) {
 #line 4734 "page-view.c"
 		gint _tmp60_ = 0;
@@ -4738,79 +4738,79 @@ void page_view_motion (PageView* self, gint x, gint y) {
 		gint _tmp66_ = 0;
 		gint _tmp67_ = 0;
 		gint _tmp68_ = 0;
-#line 723 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp60_ = dx;
-#line 723 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp61_ = min_size;
-#line 723 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp62_ = new_w;
-#line 723 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp60_ < (_tmp61_ - _tmp62_)) {
 #line 4750 "page-view.c"
 			gint _tmp63_ = 0;
 			gint _tmp64_ = 0;
-#line 724 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp63_ = min_size;
-#line 724 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp64_ = new_w;
-#line 724 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dx = _tmp63_ - _tmp64_;
 #line 4759 "page-view.c"
 		}
-#line 725 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp65_ = new_x;
-#line 725 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp66_ = new_w;
-#line 725 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp67_ = dx;
-#line 725 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp68_ = pw;
-#line 725 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (((_tmp65_ + _tmp66_) + _tmp67_) > _tmp68_) {
 #line 4771 "page-view.c"
 			gint _tmp69_ = 0;
 			gint _tmp70_ = 0;
 			gint _tmp71_ = 0;
-#line 726 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp69_ = pw;
-#line 726 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp70_ = new_x;
-#line 726 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp71_ = new_w;
-#line 726 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dx = (_tmp69_ - _tmp70_) - _tmp71_;
 #line 4783 "page-view.c"
 		}
 	}
-#line 728 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp74_ = self->priv->crop_location;
-#line 728 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp74_ == CROP_LOCATION_BOTTOM_LEFT) {
-#line 728 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp73_ = TRUE;
 #line 4792 "page-view.c"
 	} else {
 		CropLocation _tmp75_ = 0;
-#line 729 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp75_ = self->priv->crop_location;
-#line 729 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp73_ = _tmp75_ == CROP_LOCATION_BOTTOM;
 #line 4799 "page-view.c"
 	}
-#line 728 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp73_) {
-#line 728 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp72_ = TRUE;
 #line 4805 "page-view.c"
 	} else {
 		CropLocation _tmp76_ = 0;
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp76_ = self->priv->crop_location;
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp72_ = _tmp76_ == CROP_LOCATION_BOTTOM_RIGHT;
 #line 4812 "page-view.c"
 	}
-#line 728 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp72_) {
 #line 4816 "page-view.c"
 		gint _tmp77_ = 0;
@@ -4820,53 +4820,53 @@ void page_view_motion (PageView* self, gint x, gint y) {
 		gint _tmp83_ = 0;
 		gint _tmp84_ = 0;
 		gint _tmp85_ = 0;
-#line 732 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp77_ = dy;
-#line 732 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp78_ = min_size;
-#line 732 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp79_ = new_h;
-#line 732 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp77_ < (_tmp78_ - _tmp79_)) {
 #line 4832 "page-view.c"
 			gint _tmp80_ = 0;
 			gint _tmp81_ = 0;
-#line 733 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp80_ = min_size;
-#line 733 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp81_ = new_h;
-#line 733 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dy = _tmp80_ - _tmp81_;
 #line 4841 "page-view.c"
 		}
-#line 734 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp82_ = new_y;
-#line 734 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp83_ = new_h;
-#line 734 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp84_ = dy;
-#line 734 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp85_ = ph;
-#line 734 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (((_tmp82_ + _tmp83_) + _tmp84_) > _tmp85_) {
 #line 4853 "page-view.c"
 			gint _tmp86_ = 0;
 			gint _tmp87_ = 0;
 			gint _tmp88_ = 0;
-#line 735 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp86_ = ph;
-#line 735 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp87_ = new_y;
-#line 735 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp88_ = new_h;
-#line 735 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dy = (_tmp86_ - _tmp87_) - _tmp88_;
 #line 4865 "page-view.c"
 		}
 	}
-#line 737 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp89_ = self->priv->crop_location;
-#line 737 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp89_ == CROP_LOCATION_MIDDLE) {
 #line 4872 "page-view.c"
 		gint _tmp90_ = 0;
@@ -4881,327 +4881,327 @@ void page_view_motion (PageView* self, gint x, gint y) {
 		gint _tmp103_ = 0;
 		gint _tmp107_ = 0;
 		gint _tmp108_ = 0;
-#line 739 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp90_ = new_x;
-#line 739 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp91_ = dx;
-#line 739 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp92_ = new_w;
-#line 739 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp93_ = pw;
-#line 739 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (((_tmp90_ + _tmp91_) + _tmp92_) > _tmp93_) {
 #line 4895 "page-view.c"
 			gint _tmp94_ = 0;
 			gint _tmp95_ = 0;
 			gint _tmp96_ = 0;
-#line 740 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp94_ = pw;
-#line 740 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp95_ = new_x;
-#line 740 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp96_ = new_w;
-#line 740 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dx = (_tmp94_ - _tmp95_) - _tmp96_;
 #line 4907 "page-view.c"
 		}
-#line 741 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 741 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp97_ = new_x;
-#line 741 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 741 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp98_ = dx;
-#line 741 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 741 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if ((_tmp97_ + _tmp98_) < 0) {
 #line 4915 "page-view.c"
 			gint _tmp99_ = 0;
-#line 742 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp99_ = new_x;
-#line 742 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dx = -_tmp99_;
 #line 4921 "page-view.c"
 		}
-#line 743 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp100_ = new_y;
-#line 743 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp101_ = dy;
-#line 743 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp102_ = new_h;
-#line 743 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp103_ = ph;
-#line 743 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (((_tmp100_ + _tmp101_) + _tmp102_) > _tmp103_) {
 #line 4933 "page-view.c"
 			gint _tmp104_ = 0;
 			gint _tmp105_ = 0;
 			gint _tmp106_ = 0;
-#line 744 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp104_ = ph;
-#line 744 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp105_ = new_y;
-#line 744 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp106_ = new_h;
-#line 744 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dy = (_tmp104_ - _tmp105_) - _tmp106_;
 #line 4945 "page-view.c"
 		}
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp107_ = new_y;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp108_ = dy;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if ((_tmp107_ + _tmp108_) < 0) {
 #line 4953 "page-view.c"
 			gint _tmp109_ = 0;
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp109_ = new_y;
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			dy = -_tmp109_;
 #line 4959 "page-view.c"
 		}
 	}
-#line 750 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp110_ = self->priv->crop_location;
-#line 750 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp110_ == CROP_LOCATION_MIDDLE) {
 #line 4966 "page-view.c"
 		gint _tmp111_ = 0;
 		gint _tmp112_ = 0;
 		gint _tmp113_ = 0;
 		gint _tmp114_ = 0;
-#line 752 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp111_ = new_x;
-#line 752 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp112_ = dx;
-#line 752 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		new_x = _tmp111_ + _tmp112_;
-#line 753 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp113_ = new_y;
-#line 753 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp114_ = dy;
-#line 753 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		new_y = _tmp113_ + _tmp114_;
 #line 4983 "page-view.c"
 	}
-#line 755 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp117_ = self->priv->crop_location;
-#line 755 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp117_ == CROP_LOCATION_TOP_LEFT) {
-#line 755 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp116_ = TRUE;
 #line 4991 "page-view.c"
 	} else {
 		CropLocation _tmp118_ = 0;
-#line 756 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp118_ = self->priv->crop_location;
-#line 756 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp116_ = _tmp118_ == CROP_LOCATION_LEFT;
 #line 4998 "page-view.c"
 	}
-#line 755 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp116_) {
-#line 755 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp115_ = TRUE;
 #line 5004 "page-view.c"
 	} else {
 		CropLocation _tmp119_ = 0;
-#line 757 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp119_ = self->priv->crop_location;
-#line 757 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp115_ = _tmp119_ == CROP_LOCATION_BOTTOM_LEFT;
 #line 5011 "page-view.c"
 	}
-#line 755 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp115_) {
 #line 5015 "page-view.c"
 		gint _tmp120_ = 0;
 		gint _tmp121_ = 0;
 		gint _tmp122_ = 0;
 		gint _tmp123_ = 0;
-#line 759 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp120_ = new_x;
-#line 759 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp121_ = dx;
-#line 759 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		new_x = _tmp120_ + _tmp121_;
-#line 760 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp122_ = new_w;
-#line 760 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp123_ = dx;
-#line 760 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		new_w = _tmp122_ - _tmp123_;
 #line 5032 "page-view.c"
 	}
-#line 762 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp126_ = self->priv->crop_location;
-#line 762 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp126_ == CROP_LOCATION_TOP_LEFT) {
-#line 762 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp125_ = TRUE;
 #line 5040 "page-view.c"
 	} else {
 		CropLocation _tmp127_ = 0;
-#line 763 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp127_ = self->priv->crop_location;
-#line 763 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp125_ = _tmp127_ == CROP_LOCATION_TOP;
 #line 5047 "page-view.c"
 	}
-#line 762 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp125_) {
-#line 762 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp124_ = TRUE;
 #line 5053 "page-view.c"
 	} else {
 		CropLocation _tmp128_ = 0;
-#line 764 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 764 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp128_ = self->priv->crop_location;
-#line 764 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 764 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp124_ = _tmp128_ == CROP_LOCATION_TOP_RIGHT;
 #line 5060 "page-view.c"
 	}
-#line 762 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp124_) {
 #line 5064 "page-view.c"
 		gint _tmp129_ = 0;
 		gint _tmp130_ = 0;
 		gint _tmp131_ = 0;
 		gint _tmp132_ = 0;
-#line 766 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp129_ = new_y;
-#line 766 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp130_ = dy;
-#line 766 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		new_y = _tmp129_ + _tmp130_;
-#line 767 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp131_ = new_h;
-#line 767 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp132_ = dy;
-#line 767 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		new_h = _tmp131_ - _tmp132_;
 #line 5081 "page-view.c"
 	}
-#line 770 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp135_ = self->priv->crop_location;
-#line 770 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp135_ == CROP_LOCATION_TOP_RIGHT) {
-#line 770 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp134_ = TRUE;
 #line 5089 "page-view.c"
 	} else {
 		CropLocation _tmp136_ = 0;
-#line 771 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 771 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp136_ = self->priv->crop_location;
-#line 771 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 771 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp134_ = _tmp136_ == CROP_LOCATION_RIGHT;
 #line 5096 "page-view.c"
 	}
-#line 770 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp134_) {
-#line 770 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp133_ = TRUE;
 #line 5102 "page-view.c"
 	} else {
 		CropLocation _tmp137_ = 0;
-#line 772 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp137_ = self->priv->crop_location;
-#line 772 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp133_ = _tmp137_ == CROP_LOCATION_BOTTOM_RIGHT;
 #line 5109 "page-view.c"
 	}
-#line 770 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp133_) {
 #line 5113 "page-view.c"
 		gint _tmp138_ = 0;
 		gint _tmp139_ = 0;
-#line 773 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp138_ = new_w;
-#line 773 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp139_ = dx;
-#line 773 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		new_w = _tmp138_ + _tmp139_;
 #line 5122 "page-view.c"
 	}
-#line 774 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp142_ = self->priv->crop_location;
-#line 774 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp142_ == CROP_LOCATION_BOTTOM_LEFT) {
-#line 774 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp141_ = TRUE;
 #line 5130 "page-view.c"
 	} else {
 		CropLocation _tmp143_ = 0;
-#line 775 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 775 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp143_ = self->priv->crop_location;
-#line 775 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 775 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp141_ = _tmp143_ == CROP_LOCATION_BOTTOM;
 #line 5137 "page-view.c"
 	}
-#line 774 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp141_) {
-#line 774 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp140_ = TRUE;
 #line 5143 "page-view.c"
 	} else {
 		CropLocation _tmp144_ = 0;
-#line 776 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp144_ = self->priv->crop_location;
-#line 776 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp140_ = _tmp144_ == CROP_LOCATION_BOTTOM_RIGHT;
 #line 5150 "page-view.c"
 	}
-#line 774 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp140_) {
 #line 5154 "page-view.c"
 		gint _tmp145_ = 0;
 		gint _tmp146_ = 0;
-#line 777 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 777 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp145_ = new_h;
-#line 777 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 777 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp146_ = dy;
-#line 777 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 777 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		new_h = _tmp145_ + _tmp146_;
 #line 5163 "page-view.c"
 	}
-#line 779 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp147_ = self->priv->_page;
-#line 779 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp148_ = new_x;
-#line 779 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp149_ = new_y;
-#line 779 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_move_crop (_tmp147_, _tmp148_, _tmp149_);
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp151_ = new_w;
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp152_ = cw;
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp151_ != _tmp152_) {
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp150_ = TRUE;
 #line 5181 "page-view.c"
 	} else {
 		gint _tmp153_ = 0;
 		gint _tmp154_ = 0;
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp153_ = new_h;
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp154_ = ch;
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp150_ = _tmp153_ != _tmp154_;
 #line 5191 "page-view.c"
 	}
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp150_) {
 #line 5195 "page-view.c"
 		Page* _tmp155_ = NULL;
 		gint _tmp156_ = 0;
 		gint _tmp157_ = 0;
-#line 783 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp155_ = self->priv->_page;
-#line 783 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp156_ = new_w;
-#line 783 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp157_ = new_h;
-#line 783 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_set_custom_crop (_tmp155_, _tmp156_, _tmp157_);
 #line 5207 "page-view.c"
 	}
@@ -5209,11 +5209,11 @@ void page_view_motion (PageView* self, gint x, gint y) {
 
 
 void page_view_button_release (PageView* self, gint x, gint y) {
-#line 786 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 789 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->crop_location = CROP_LOCATION_NONE;
-#line 790 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
 #line 5219 "page-view.c"
 }
@@ -5223,19 +5223,19 @@ static gboolean page_view_animation_cb (PageView* self) {
 	gboolean result = FALSE;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 793 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 795 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 795 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->animate_segment;
-#line 795 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 795 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->animate_n_segments;
-#line 795 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 795 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->animate_segment = (_tmp0_ + 1) % _tmp1_;
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
-#line 797 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = TRUE;
-#line 797 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
 #line 5241 "page-view.c"
 }
@@ -5244,7 +5244,7 @@ static gboolean page_view_animation_cb (PageView* self) {
 static gboolean _page_view_animation_cb_gsource_func (gpointer self) {
 	gboolean result;
 	result = page_view_animation_cb ((PageView*) self);
-#line 813 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 813 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
 #line 5250 "page-view.c"
 }
@@ -5261,85 +5261,85 @@ static void page_view_update_animation (PageView* self) {
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp10_ = FALSE;
-#line 800 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 804 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->_page;
-#line 804 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_get_is_scanning (_tmp1_);
-#line 804 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = _tmp2_;
-#line 804 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp3_) {
 #line 5275 "page-view.c"
 		Page* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
-#line 804 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp4_ = self->priv->_page;
-#line 804 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp5_ = page_get_has_data (_tmp4_);
-#line 804 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp6_ = _tmp5_;
-#line 804 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp0_ = !_tmp6_;
 #line 5287 "page-view.c"
 	} else {
-#line 804 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp0_ = FALSE;
 #line 5291 "page-view.c"
 	}
-#line 804 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	animate = _tmp0_;
-#line 805 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp7_ = self->priv->animate_timeout;
-#line 805 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	is_animating = _tmp7_ != ((guint) 0);
-#line 806 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp8_ = animate;
-#line 806 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp9_ = is_animating;
-#line 806 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp8_ == _tmp9_) {
-#line 807 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
 #line 5307 "page-view.c"
 	}
-#line 809 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp10_ = animate;
-#line 809 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp10_) {
 #line 5313 "page-view.c"
 		guint _tmp11_ = 0U;
-#line 811 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 811 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->animate_segment = 0;
-#line 812 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp11_ = self->priv->animate_timeout;
-#line 812 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp11_ == ((guint) 0)) {
 #line 5321 "page-view.c"
 			guint _tmp12_ = 0U;
-#line 813 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 813 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp12_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 150, _page_view_animation_cb_gsource_func, page_view_ref (self), page_view_unref);
-#line 813 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 813 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			self->priv->animate_timeout = _tmp12_;
 #line 5327 "page-view.c"
 		}
 	} else {
 		guint _tmp13_ = 0U;
-#line 817 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp13_ = self->priv->animate_timeout;
-#line 817 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp13_ != ((guint) 0)) {
 #line 5335 "page-view.c"
 			guint _tmp14_ = 0U;
-#line 818 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp14_ = self->priv->animate_timeout;
-#line 818 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			g_source_remove (_tmp14_);
 #line 5341 "page-view.c"
 		}
-#line 819 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->animate_timeout = (guint) 0;
 #line 5345 "page-view.c"
 	}
@@ -5383,109 +5383,109 @@ void page_view_render (PageView* self, cairo_t* context) {
 	Page* _tmp118_ = NULL;
 	gboolean _tmp119_ = FALSE;
 	gboolean _tmp120_ = FALSE;
-#line 823 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 823 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 823 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 823 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (context != NULL);
-#line 825 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 825 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_update_animation (self);
-#line 826 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 826 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_update_page_view (self);
-#line 828 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = page_view_get_preview_width (self);
-#line 828 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	w = _tmp0_;
-#line 829 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = page_view_get_preview_height (self);
-#line 829 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	h = _tmp1_;
-#line 831 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = context;
-#line 831 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_set_line_width (_tmp2_, (gdouble) 1);
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = context;
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = self->priv->_x_offset;
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp5_ = self->priv->_y_offset;
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_translate (_tmp3_, (gdouble) _tmp4_, (gdouble) _tmp5_);
-#line 835 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = context;
-#line 835 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_set_source_rgb (_tmp6_, (gdouble) 0, (gdouble) 0, (gdouble) 0);
-#line 836 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp7_ = context;
-#line 836 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp8_ = self->priv->border_width;
-#line 836 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 836 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_set_line_width (_tmp7_, (gdouble) _tmp8_);
-#line 837 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp9_ = context;
-#line 837 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp10_ = self->priv->border_width;
-#line 837 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp11_ = self->priv->border_width;
-#line 837 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp12_ = self->priv->width_;
-#line 837 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp13_ = self->priv->border_width;
-#line 837 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp14_ = self->priv->height_;
-#line 837 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp15_ = self->priv->border_width;
-#line 837 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_rectangle (_tmp9_, ((gdouble) _tmp10_) / 2, ((gdouble) _tmp11_) / 2, (gdouble) (_tmp12_ - _tmp13_), (gdouble) (_tmp14_ - _tmp15_));
-#line 841 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp16_ = context;
-#line 841 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_stroke (_tmp16_);
-#line 844 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp17_ = context;
-#line 844 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp18_ = self->priv->border_width;
-#line 844 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp19_ = self->priv->border_width;
-#line 844 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 844 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_translate (_tmp17_, (gdouble) _tmp18_, (gdouble) _tmp19_);
-#line 845 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp20_ = context;
-#line 845 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp21_ = self->priv->image;
-#line 845 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	gdk_cairo_set_source_pixbuf (_tmp20_, _tmp21_, (gdouble) 0, (gdouble) 0);
-#line 846 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp22_ = context;
-#line 846 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	cairo_paint (_tmp22_);
-#line 849 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp24_ = self->priv->_page;
-#line 849 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp25_ = page_get_is_scanning (_tmp24_);
-#line 849 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp26_ = _tmp25_;
-#line 849 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp26_) {
 #line 5471 "page-view.c"
 		Page* _tmp27_ = NULL;
 		gboolean _tmp28_ = FALSE;
 		gboolean _tmp29_ = FALSE;
-#line 849 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp27_ = self->priv->_page;
-#line 849 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp28_ = page_get_has_data (_tmp27_);
-#line 849 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp29_ = _tmp28_;
-#line 849 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp23_ = !_tmp29_;
 #line 5483 "page-view.c"
 	} else {
-#line 849 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp23_ = FALSE;
 #line 5487 "page-view.c"
 	}
-#line 849 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp23_) {
 #line 5491 "page-view.c"
 		gdouble outer_radius = 0.0;
@@ -5508,72 +5508,72 @@ void page_view_render (PageView* self, cairo_t* context) {
 		gdouble _tmp44_ = 0.0;
 		gdouble _tmp45_ = 0.0;
 		gdouble offset = 0.0;
-#line 852 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 852 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp30_ = w;
-#line 852 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 852 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp31_ = h;
-#line 852 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 852 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (_tmp30_ > _tmp31_) {
 #line 5518 "page-view.c"
 			gint _tmp32_ = 0;
-#line 853 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp32_ = w;
-#line 853 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			outer_radius = 0.15 * _tmp32_;
 #line 5524 "page-view.c"
 		} else {
 			gint _tmp33_ = 0;
-#line 855 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp33_ = h;
-#line 855 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			outer_radius = 0.15 * _tmp33_;
 #line 5531 "page-view.c"
 		}
-#line 856 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 856 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp34_ = self->priv->animate_n_segments;
-#line 856 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 856 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		arc = G_PI / _tmp34_;
-#line 859 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp35_ = outer_radius;
-#line 859 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp36_ = arc;
-#line 859 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp37_ = sin (_tmp36_);
-#line 859 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		x = _tmp35_ * _tmp37_;
-#line 860 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp38_ = outer_radius;
-#line 860 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp39_ = arc;
-#line 860 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp40_ = cos (_tmp39_);
-#line 860 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		y = _tmp38_ * (_tmp40_ - 1.0);
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp41_ = x;
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp42_ = x;
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp43_ = y;
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp44_ = y;
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp45_ = sqrt ((_tmp41_ * _tmp42_) + (_tmp43_ * _tmp44_));
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		inner_radius = 0.6 * _tmp45_;
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		offset = 0.0;
 #line 5567 "page-view.c"
 		{
 			gint i = 0;
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			i = 0;
 #line 5572 "page-view.c"
 			{
 				gboolean _tmp46_ = FALSE;
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp46_ = TRUE;
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				while (TRUE) {
 #line 5579 "page-view.c"
 					gint _tmp50_ = 0;
@@ -5594,125 +5594,125 @@ void page_view_render (PageView* self, cairo_t* context) {
 					gint _tmp65_ = 0;
 					cairo_t* _tmp68_ = NULL;
 					cairo_t* _tmp69_ = NULL;
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					if (!_tmp46_) {
 #line 5600 "page-view.c"
 						gint _tmp47_ = 0;
 						gdouble _tmp48_ = 0.0;
 						gdouble _tmp49_ = 0.0;
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp47_ = i;
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						i = _tmp47_ + 1;
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp48_ = offset;
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp49_ = arc;
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						offset = _tmp48_ + (_tmp49_ * 2);
 #line 5614 "page-view.c"
 					}
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp46_ = FALSE;
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp50_ = i;
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp51_ = self->priv->animate_n_segments;
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					if (!(_tmp50_ < _tmp51_)) {
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						break;
 #line 5626 "page-view.c"
 					}
-#line 866 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp52_ = w;
-#line 866 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp53_ = outer_radius;
-#line 866 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp54_ = offset;
-#line 866 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp55_ = sin (_tmp54_);
-#line 866 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					x = (_tmp52_ / 2) + (_tmp53_ * _tmp55_);
-#line 867 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp56_ = h;
-#line 867 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp57_ = outer_radius;
-#line 867 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp58_ = offset;
-#line 867 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp59_ = cos (_tmp58_);
-#line 867 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					y = (_tmp56_ / 2) - (_tmp57_ * _tmp59_);
-#line 868 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp60_ = context;
-#line 868 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp61_ = x;
-#line 868 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp62_ = y;
-#line 868 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp63_ = inner_radius;
-#line 868 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					cairo_arc (_tmp60_, _tmp61_, _tmp62_, _tmp63_, (gdouble) 0, 2 * G_PI);
-#line 870 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 870 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp64_ = i;
-#line 870 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 870 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp65_ = self->priv->animate_segment;
-#line 870 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 870 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					if (_tmp64_ == _tmp65_) {
 #line 5664 "page-view.c"
 						cairo_t* _tmp66_ = NULL;
 						cairo_t* _tmp67_ = NULL;
-#line 872 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp66_ = context;
-#line 872 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						cairo_set_source_rgb (_tmp66_, 0.75, 0.75, 0.75);
-#line 873 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						_tmp67_ = context;
-#line 873 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						cairo_fill_preserve (_tmp67_);
 #line 5675 "page-view.c"
 					}
-#line 876 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp68_ = context;
-#line 876 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					cairo_set_source_rgb (_tmp68_, 0.5, 0.5, 0.5);
-#line 877 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					_tmp69_ = context;
-#line 877 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 877 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					cairo_stroke (_tmp69_);
 #line 5685 "page-view.c"
 				}
 			}
 		}
 	}
-#line 882 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp71_ = self->priv->_page;
-#line 882 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp72_ = page_get_is_scanning (_tmp71_);
-#line 882 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp73_ = _tmp72_;
-#line 882 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp73_) {
 #line 5698 "page-view.c"
 		Page* _tmp74_ = NULL;
 		gint _tmp75_ = 0;
 		gint _tmp76_ = 0;
-#line 882 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp74_ = self->priv->_page;
-#line 882 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp75_ = page_get_scan_line (_tmp74_);
-#line 882 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp76_ = _tmp75_;
-#line 882 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp70_ = _tmp76_ > 0;
 #line 5710 "page-view.c"
 	} else {
-#line 882 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp70_ = FALSE;
 #line 5714 "page-view.c"
 	}
-#line 882 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp70_) {
 #line 5718 "page-view.c"
 		gint scan_line = 0;
@@ -5735,23 +5735,23 @@ void page_view_render (PageView* self, cairo_t* context) {
 		gdouble _tmp115_ = 0.0;
 		cairo_t* _tmp116_ = NULL;
 		cairo_t* _tmp117_ = NULL;
-#line 884 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp77_ = self->priv->_page;
-#line 884 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp78_ = page_get_scan_line (_tmp77_);
-#line 884 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp79_ = _tmp78_;
-#line 884 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		scan_line = _tmp79_;
-#line 888 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp80_ = self->priv->_page;
-#line 888 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp81_ = page_get_scan_direction (_tmp80_);
-#line 888 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp82_ = _tmp81_;
-#line 888 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		switch (_tmp82_) {
-#line 888 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_TOP_TO_BOTTOM:
 #line 5757 "page-view.c"
 			{
@@ -5760,31 +5760,31 @@ void page_view_render (PageView* self, cairo_t* context) {
 				gdouble _tmp85_ = 0.0;
 				gint _tmp86_ = 0;
 				gdouble _tmp87_ = 0.0;
-#line 891 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp83_ = scan_line;
-#line 891 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp84_ = page_view_page_to_screen_y (self, _tmp83_);
-#line 891 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				s = (gdouble) _tmp84_;
-#line 892 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x1 = (gdouble) 0;
-#line 892 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp85_ = s;
-#line 892 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y1 = _tmp85_ + 0.5;
-#line 893 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp86_ = w;
-#line 893 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x2 = (gdouble) _tmp86_;
-#line 893 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp87_ = s;
-#line 893 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y2 = _tmp87_ + 0.5;
-#line 894 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
 #line 5786 "page-view.c"
 			}
-#line 888 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_BOTTOM_TO_TOP:
 #line 5790 "page-view.c"
 			{
@@ -5795,35 +5795,35 @@ void page_view_render (PageView* self, cairo_t* context) {
 				gint _tmp92_ = 0;
 				gint _tmp93_ = 0;
 				gdouble _tmp94_ = 0.0;
-#line 896 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp88_ = scan_line;
-#line 896 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp89_ = page_view_page_to_screen_y (self, _tmp88_);
-#line 896 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				s = (gdouble) _tmp89_;
-#line 897 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x1 = (gdouble) 0;
-#line 897 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp90_ = h;
-#line 897 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp91_ = s;
-#line 897 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y1 = (_tmp90_ - _tmp91_) + 0.5;
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp92_ = w;
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x2 = (gdouble) _tmp92_;
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp93_ = h;
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp94_ = s;
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y2 = (_tmp93_ - _tmp94_) + 0.5;
-#line 899 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
 #line 5825 "page-view.c"
 			}
-#line 888 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_LEFT_TO_RIGHT:
 #line 5829 "page-view.c"
 			{
@@ -5832,31 +5832,31 @@ void page_view_render (PageView* self, cairo_t* context) {
 				gdouble _tmp97_ = 0.0;
 				gdouble _tmp98_ = 0.0;
 				gint _tmp99_ = 0;
-#line 901 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp95_ = scan_line;
-#line 901 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp96_ = page_view_page_to_screen_x (self, _tmp95_);
-#line 901 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				s = (gdouble) _tmp96_;
-#line 902 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 902 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp97_ = s;
-#line 902 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 902 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x1 = _tmp97_ + 0.5;
-#line 902 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 902 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y1 = (gdouble) 0;
-#line 903 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp98_ = s;
-#line 903 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x2 = _tmp98_ + 0.5;
-#line 903 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp99_ = h;
-#line 903 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y2 = (gdouble) _tmp99_;
-#line 904 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 904 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
 #line 5858 "page-view.c"
 			}
-#line 888 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_RIGHT_TO_LEFT:
 #line 5862 "page-view.c"
 			{
@@ -5867,31 +5867,31 @@ void page_view_render (PageView* self, cairo_t* context) {
 				gint _tmp104_ = 0;
 				gdouble _tmp105_ = 0.0;
 				gint _tmp106_ = 0;
-#line 906 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 906 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp100_ = scan_line;
-#line 906 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 906 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp101_ = page_view_page_to_screen_x (self, _tmp100_);
-#line 906 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 906 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				s = (gdouble) _tmp101_;
-#line 907 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp102_ = w;
-#line 907 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp103_ = s;
-#line 907 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x1 = (_tmp102_ - _tmp103_) + 0.5;
-#line 907 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y1 = (gdouble) 0;
-#line 908 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp104_ = w;
-#line 908 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp105_ = s;
-#line 908 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x2 = (_tmp104_ - _tmp105_) + 0.5;
-#line 908 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp106_ = h;
-#line 908 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y2 = (gdouble) _tmp106_;
-#line 909 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 909 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
 #line 5897 "page-view.c"
 			}
@@ -5900,58 +5900,58 @@ void page_view_render (PageView* self, cairo_t* context) {
 				gdouble _tmp107_ = 0.0;
 				gdouble _tmp108_ = 0.0;
 				gdouble _tmp109_ = 0.0;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y2 = (gdouble) 0;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp107_ = y2;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x2 = _tmp107_;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp108_ = x2;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y1 = _tmp108_;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				_tmp109_ = y1;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x1 = _tmp109_;
-#line 912 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
 #line 5920 "page-view.c"
 			}
 		}
-#line 915 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp110_ = context;
-#line 915 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp111_ = x1;
-#line 915 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp112_ = y1;
-#line 915 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_move_to (_tmp110_, _tmp111_, _tmp112_);
-#line 916 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 916 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp113_ = context;
-#line 916 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 916 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp114_ = x2;
-#line 916 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 916 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp115_ = y2;
-#line 916 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 916 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_line_to (_tmp113_, _tmp114_, _tmp115_);
-#line 917 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 917 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp116_ = context;
-#line 917 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 917 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_set_source_rgb (_tmp116_, 1.0, 0.0, 0.0);
-#line 918 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp117_ = context;
-#line 918 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_stroke (_tmp117_);
 #line 5947 "page-view.c"
 	}
-#line 922 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp118_ = self->priv->_page;
-#line 922 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp119_ = page_get_has_crop (_tmp118_);
-#line 922 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp120_ = _tmp119_;
-#line 922 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp120_) {
 #line 5957 "page-view.c"
 		gint x = 0;
@@ -6008,137 +6008,137 @@ void page_view_render (PageView* self, cairo_t* context) {
 		gint _tmp164_ = 0;
 		cairo_t* _tmp165_ = NULL;
 		cairo_t* _tmp166_ = NULL;
-#line 924 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp121_ = self->priv->_page;
-#line 924 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp122_ = page_get_crop_x (_tmp121_);
-#line 924 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp123_ = _tmp122_;
-#line 924 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		x = _tmp123_;
-#line 925 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp124_ = self->priv->_page;
-#line 925 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp125_ = page_get_crop_y (_tmp124_);
-#line 925 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp126_ = _tmp125_;
-#line 925 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		y = _tmp126_;
-#line 926 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp127_ = self->priv->_page;
-#line 926 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp128_ = page_get_crop_width (_tmp127_);
-#line 926 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp129_ = _tmp128_;
-#line 926 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		crop_width = _tmp129_;
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp130_ = self->priv->_page;
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp131_ = page_get_crop_height (_tmp130_);
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp132_ = _tmp131_;
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		crop_height = _tmp132_;
-#line 929 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp133_ = x;
-#line 929 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp134_ = page_view_page_to_screen_x (self, _tmp133_);
-#line 929 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		dx = _tmp134_;
-#line 930 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 930 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp135_ = y;
-#line 930 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 930 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp136_ = page_view_page_to_screen_y (self, _tmp135_);
-#line 930 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 930 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		dy = _tmp136_;
-#line 931 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 931 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp137_ = crop_width;
-#line 931 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 931 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp138_ = page_view_page_to_screen_x (self, _tmp137_);
-#line 931 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 931 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		dw = _tmp138_;
-#line 932 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp139_ = crop_height;
-#line 932 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp140_ = page_view_page_to_screen_y (self, _tmp139_);
-#line 932 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		dh = _tmp140_;
-#line 935 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp141_ = context;
-#line 935 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp142_ = w;
-#line 935 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp143_ = h;
-#line 935 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 935 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_rectangle (_tmp141_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp142_, (gdouble) _tmp143_);
-#line 936 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 936 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp144_ = context;
-#line 936 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 936 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_new_sub_path (_tmp144_);
-#line 937 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp145_ = context;
-#line 937 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp146_ = dx;
-#line 937 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp147_ = dy;
-#line 937 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp148_ = dw;
-#line 937 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp149_ = dh;
-#line 937 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_rectangle (_tmp145_, (gdouble) _tmp146_, (gdouble) _tmp147_, (gdouble) _tmp148_, (gdouble) _tmp149_);
-#line 938 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 938 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp150_ = context;
-#line 938 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 938 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_set_fill_rule (_tmp150_, CAIRO_FILL_RULE_EVEN_ODD);
-#line 939 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 939 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp151_ = context;
-#line 939 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 939 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_set_source_rgba (_tmp151_, 0.25, 0.25, 0.25, 0.2);
-#line 940 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 940 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp152_ = context;
-#line 940 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 940 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_fill (_tmp152_);
-#line 943 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp153_ = context;
-#line 943 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp154_ = dx;
-#line 943 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp155_ = dy;
-#line 943 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp156_ = dw;
-#line 943 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp157_ = dh;
-#line 943 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_rectangle (_tmp153_, _tmp154_ - 1.5, _tmp155_ - 1.5, (gdouble) (_tmp156_ + 3), (gdouble) (_tmp157_ + 3));
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp158_ = context;
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_set_source_rgb (_tmp158_, 1.0, 1.0, 1.0);
-#line 945 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp159_ = context;
-#line 945 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_stroke (_tmp159_);
-#line 946 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp160_ = context;
-#line 946 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp161_ = dx;
-#line 946 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp162_ = dy;
-#line 946 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp163_ = dw;
-#line 946 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp164_ = dh;
-#line 946 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_rectangle (_tmp160_, _tmp161_ - 0.5, _tmp162_ - 0.5, (gdouble) (_tmp163_ + 1), (gdouble) (_tmp164_ + 1));
-#line 947 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp165_ = context;
-#line 947 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_set_source_rgb (_tmp165_, 0.0, 0.0, 0.0);
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp166_ = context;
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		cairo_stroke (_tmp166_);
 #line 6144 "page-view.c"
 	}
@@ -6146,54 +6146,54 @@ void page_view_render (PageView* self, cairo_t* context) {
 
 
 static void page_view_page_pixels_changed_cb (PageView* self, Page* p) {
-#line 994 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 994 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (p != NULL);
-#line 997 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
-#line 998 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 998 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
 #line 6158 "page-view.c"
 }
 
 
 static void page_view_page_size_changed_cb (PageView* self, Page* p) {
-#line 1001 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 1001 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (p != NULL);
-#line 1004 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 1004 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
-#line 1005 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 1005 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "size-changed");
-#line 1006 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 1006 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
 #line 6173 "page-view.c"
 }
 
 
 static void page_view_page_overlay_changed_cb (PageView* self, Page* p) {
-#line 1009 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 1009 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 1009 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 1009 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (p != NULL);
-#line 1011 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
 #line 6184 "page-view.c"
 }
 
 
 static void page_view_scan_direction_changed_cb (PageView* self, Page* p) {
-#line 1014 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 1014 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (p != NULL);
-#line 1017 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
-#line 1018 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "size-changed");
-#line 1019 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
 #line 6199 "page-view.c"
 }
@@ -6202,20 +6202,20 @@ static void page_view_scan_direction_changed_cb (PageView* self, Page* p) {
 Page* page_view_get_page (PageView* self) {
 	Page* result;
 	Page* _tmp0_ = NULL;
-#line 29 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 29 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->_page;
-#line 29 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_;
-#line 29 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
 #line 6214 "page-view.c"
 }
 
 
 static gpointer _page_ref0 (gpointer self) {
-#line 29 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return self ? page_ref (self) : NULL;
 #line 6221 "page-view.c"
 }
@@ -6224,15 +6224,15 @@ static gpointer _page_ref0 (gpointer self) {
 static void page_view_set_page (PageView* self, Page* value) {
 	Page* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 29 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 29 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = value;
-#line 29 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = _page_ref0 (_tmp0_);
-#line 29 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_page_unref0 (self->priv->_page);
-#line 29 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->_page = _tmp1_;
 #line 6238 "page-view.c"
 }
@@ -6241,13 +6241,13 @@ static void page_view_set_page (PageView* self, Page* value) {
 gboolean page_view_get_selected (PageView* self) {
 	gboolean result;
 	gboolean _tmp0_ = FALSE;
-#line 38 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 38 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->selected_;
-#line 38 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_;
-#line 38 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
 #line 6253 "page-view.c"
 }
@@ -6260,76 +6260,76 @@ void page_view_set_selected (PageView* self, gboolean value) {
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp11_ = FALSE;
 	gboolean _tmp12_ = FALSE;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_view_get_selected (self);
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = _tmp2_;
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp3_) {
 #line 6272 "page-view.c"
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp4_ = page_view_get_selected (self);
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp5_ = _tmp4_;
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp1_ = _tmp5_;
 #line 6281 "page-view.c"
 	} else {
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp1_ = FALSE;
 #line 6285 "page-view.c"
 	}
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp1_) {
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp0_ = TRUE;
 #line 6291 "page-view.c"
 	} else {
 		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
 		gboolean _tmp8_ = FALSE;
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp7_ = page_view_get_selected (self);
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp8_ = _tmp7_;
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (!_tmp8_) {
 #line 6302 "page-view.c"
 			gboolean _tmp9_ = FALSE;
 			gboolean _tmp10_ = FALSE;
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp9_ = page_view_get_selected (self);
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp10_ = _tmp9_;
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp6_ = !_tmp10_;
 #line 6311 "page-view.c"
 		} else {
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			_tmp6_ = FALSE;
 #line 6315 "page-view.c"
 		}
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp0_ = _tmp6_;
 #line 6319 "page-view.c"
 	}
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp0_) {
-#line 42 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
 #line 6325 "page-view.c"
 	}
-#line 43 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp11_ = page_view_get_selected (self);
-#line 43 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp12_ = _tmp11_;
-#line 43 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_set_selected (self, _tmp12_);
-#line 44 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
 #line 6335 "page-view.c"
 }
@@ -6338,13 +6338,13 @@ void page_view_set_selected (PageView* self, gboolean value) {
 gint page_view_get_x_offset (PageView* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 64 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 64 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->_x_offset;
-#line 64 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_;
-#line 64 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
 #line 6350 "page-view.c"
 }
@@ -6352,11 +6352,11 @@ gint page_view_get_x_offset (PageView* self) {
 
 void page_view_set_x_offset (PageView* self, gint value) {
 	gint _tmp0_ = 0;
-#line 64 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 64 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = value;
-#line 64 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->_x_offset = _tmp0_;
 #line 6362 "page-view.c"
 }
@@ -6365,13 +6365,13 @@ void page_view_set_x_offset (PageView* self, gint value) {
 gint page_view_get_y_offset (PageView* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->_y_offset;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
 #line 6377 "page-view.c"
 }
@@ -6379,11 +6379,11 @@ gint page_view_get_y_offset (PageView* self) {
 
 void page_view_set_y_offset (PageView* self, gint value) {
 	gint _tmp0_ = 0;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = value;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->_y_offset = _tmp0_;
 #line 6389 "page-view.c"
 }
@@ -6392,13 +6392,13 @@ void page_view_set_y_offset (PageView* self, gint value) {
 GdkCursorType page_view_get_cursor (PageView* self) {
 	GdkCursorType result;
 	GdkCursorType _tmp0_ = 0;
-#line 76 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 76 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->_cursor;
-#line 76 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_;
-#line 76 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
 #line 6404 "page-view.c"
 }
@@ -6406,11 +6406,11 @@ GdkCursorType page_view_get_cursor (PageView* self) {
 
 static void page_view_set_cursor (PageView* self, GdkCursorType value) {
 	GdkCursorType _tmp0_ = 0;
-#line 76 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 76 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = value;
-#line 76 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->_cursor = _tmp0_;
 #line 6416 "page-view.c"
 }
@@ -6419,13 +6419,13 @@ static void page_view_set_cursor (PageView* self, GdkCursorType value) {
 gint page_view_get_width (PageView* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 954 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 954 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->width_;
-#line 954 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_;
-#line 954 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
 #line 6431 "page-view.c"
 }
@@ -6445,64 +6445,64 @@ void page_view_set_width (PageView* self, gint value) {
 	gint _tmp9_ = 0;
 	gint _tmp12_ = 0;
 	gint _tmp13_ = 0;
-#line 955 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = value;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->_page;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_get_height (_tmp1_);
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = _tmp2_;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = self->priv->_page;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp5_ = page_get_width (_tmp4_);
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = _tmp5_;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	h = (gint) ((((gdouble) _tmp0_) * _tmp3_) / _tmp6_);
-#line 959 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp8_ = self->priv->width_;
-#line 959 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp9_ = value;
-#line 959 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp8_ == _tmp9_) {
 #line 6473 "page-view.c"
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
-#line 959 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp10_ = self->priv->height_;
-#line 959 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp11_ = h;
-#line 959 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp7_ = _tmp10_ == _tmp11_;
 #line 6482 "page-view.c"
 	} else {
-#line 959 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp7_ = FALSE;
 #line 6486 "page-view.c"
 	}
-#line 959 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp7_) {
-#line 960 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
 #line 6492 "page-view.c"
 	}
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp12_ = value;
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->width_ = _tmp12_;
-#line 963 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp13_ = h;
-#line 963 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->height_ = _tmp13_;
-#line 966 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
-#line 968 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "size-changed");
-#line 969 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
 #line 6508 "page-view.c"
 }
@@ -6511,13 +6511,13 @@ void page_view_set_width (PageView* self, gint value) {
 gint page_view_get_height (PageView* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 975 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 975 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->height_;
-#line 975 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_;
-#line 975 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
 #line 6523 "page-view.c"
 }
@@ -6537,80 +6537,80 @@ void page_view_set_height (PageView* self, gint value) {
 	gint _tmp9_ = 0;
 	gint _tmp12_ = 0;
 	gint _tmp13_ = 0;
-#line 976 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 976 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 979 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = value;
-#line 979 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->_page;
-#line 979 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = page_get_width (_tmp1_);
-#line 979 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = _tmp2_;
-#line 979 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = self->priv->_page;
-#line 979 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp5_ = page_get_height (_tmp4_);
-#line 979 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = _tmp5_;
-#line 979 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	w = (gint) ((((gdouble) _tmp0_) * _tmp3_) / _tmp6_);
-#line 980 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp8_ = self->priv->width_;
-#line 980 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp9_ = w;
-#line 980 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp8_ == _tmp9_) {
 #line 6565 "page-view.c"
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
-#line 980 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp10_ = self->priv->height_;
-#line 980 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp11_ = value;
-#line 980 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp7_ = _tmp10_ == _tmp11_;
 #line 6574 "page-view.c"
 	} else {
-#line 980 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp7_ = FALSE;
 #line 6578 "page-view.c"
 	}
-#line 980 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp7_) {
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
 #line 6584 "page-view.c"
 	}
-#line 983 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp12_ = w;
-#line 983 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->width_ = _tmp12_;
-#line 984 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp13_ = value;
-#line 984 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->height_ = _tmp13_;
-#line 987 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
-#line 989 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 989 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "size-changed");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
 #line 6600 "page-view.c"
 }
 
 
 static void value_page_view_init (GValue* value) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	value->data[0].v_pointer = NULL;
 #line 6607 "page-view.c"
 }
 
 
 static void value_page_view_free_value (GValue* value) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (value->data[0].v_pointer) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_unref (value->data[0].v_pointer);
 #line 6616 "page-view.c"
 	}
@@ -6618,13 +6618,13 @@ static void value_page_view_free_value (GValue* value) {
 
 
 static void value_page_view_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (src_value->data[0].v_pointer) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		dest_value->data[0].v_pointer = page_view_ref (src_value->data[0].v_pointer);
 #line 6626 "page-view.c"
 	} else {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 6630 "page-view.c"
 	}
@@ -6632,37 +6632,37 @@ static void value_page_view_copy_value (const GValue* src_value, GValue* dest_va
 
 
 static gpointer value_page_view_peek_pointer (const GValue* value) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return value->data[0].v_pointer;
 #line 6638 "page-view.c"
 }
 
 
 static gchar* value_page_view_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (collect_values[0].v_pointer) {
 #line 6645 "page-view.c"
 		PageView* object;
 		object = collect_values[0].v_pointer;
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 6652 "page-view.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.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 6656 "page-view.c"
 		}
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = page_view_ref (object);
 #line 6660 "page-view.c"
 	} else {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = NULL;
 #line 6664 "page-view.c"
 	}
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return NULL;
 #line 6668 "page-view.c"
 }
@@ -6671,27 +6671,27 @@ static gchar* value_page_view_collect_value (GValue* value, guint n_collect_valu
 static gchar* value_page_view_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PageView** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (!object_p) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 6679 "page-view.c"
 	}
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (!value->data[0].v_pointer) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		*object_p = NULL;
 #line 6685 "page-view.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		*object_p = value->data[0].v_pointer;
 #line 6689 "page-view.c"
 	} else {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		*object_p = page_view_ref (value->data[0].v_pointer);
 #line 6693 "page-view.c"
 	}
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return NULL;
 #line 6697 "page-view.c"
 }
@@ -6699,22 +6699,22 @@ static gchar* value_page_view_lcopy_value (const GValue* value, guint n_collect_
 
 GParamSpec* param_spec_page_view (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPageView* spec;
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PAGE_VIEW), NULL);
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return G_PARAM_SPEC (spec);
 #line 6711 "page-view.c"
 }
 
 
 gpointer value_get_page_view (const GValue* value) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE_VIEW), NULL);
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return value->data[0].v_pointer;
 #line 6720 "page-view.c"
 }
@@ -6722,29 +6722,29 @@ gpointer value_get_page_view (const GValue* value) {
 
 void value_set_page_view (GValue* value, gpointer v_object) {
 	PageView* old;
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE_VIEW));
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	old = value->data[0].v_pointer;
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (v_object) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PAGE_VIEW));
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = v_object;
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_ref (value->data[0].v_pointer);
 #line 6740 "page-view.c"
 	} else {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = NULL;
 #line 6744 "page-view.c"
 	}
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (old) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_unref (old);
 #line 6750 "page-view.c"
 	}
@@ -6753,27 +6753,27 @@ void value_set_page_view (GValue* value, gpointer v_object) {
 
 void value_take_page_view (GValue* value, gpointer v_object) {
 	PageView* old;
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE_VIEW));
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	old = value->data[0].v_pointer;
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (v_object) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PAGE_VIEW));
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = v_object;
 #line 6769 "page-view.c"
 	} else {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = NULL;
 #line 6773 "page-view.c"
 	}
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (old) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_unref (old);
 #line 6779 "page-view.c"
 	}
@@ -6781,36 +6781,36 @@ void value_take_page_view (GValue* value, gpointer v_object) {
 
 
 static void page_view_class_init (PageViewClass * klass) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	page_view_parent_class = g_type_class_peek_parent (klass);
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	((PageViewClass *) klass)->finalize = page_view_finalize;
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_type_class_add_private (klass, sizeof (PageViewPrivate));
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_new ("size_changed", TYPE_PAGE_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_new ("changed", TYPE_PAGE_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 6795 "page-view.c"
 }
 
 
 static void page_view_instance_init (PageView * self) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv = PAGE_VIEW_GET_PRIVATE (self);
-#line 32 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->image = NULL;
-#line 35 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 35 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->selected_ = FALSE;
-#line 48 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->border_width = 1;
-#line 51 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
-#line 76 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->_cursor = GDK_ARROW;
-#line 78 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->animate_n_segments = 7;
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->ref_count = 1;
 #line 6816 "page-view.c"
 }
@@ -6828,43 +6828,43 @@ static void page_view_finalize (PageView* obj) {
 	guint _tmp7_ = 0U;
 	Page* _tmp8_ = NULL;
 	guint _tmp9_ = 0U;
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_VIEW, PageView);
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_handlers_destroy (self);
-#line 97 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp0_ = self->priv->_page;
-#line 97 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 97 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _page_view_page_pixels_changed_cb_page_pixels_changed, self);
-#line 98 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp2_ = self->priv->_page;
-#line 98 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_parse_name ("size-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 98 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _page_view_page_size_changed_cb_page_size_changed, self);
-#line 99 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = self->priv->_page;
-#line 99 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp5_, NULL, FALSE);
-#line 99 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _page_view_page_overlay_changed_cb_page_crop_changed, self);
-#line 100 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = self->priv->_page;
-#line 100 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_parse_name ("scan-line-changed", TYPE_PAGE, &_tmp7_, NULL, FALSE);
-#line 100 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _page_view_page_overlay_changed_cb_page_scan_line_changed, self);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp8_ = self->priv->_page;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_parse_name ("scan-direction-changed", TYPE_PAGE, &_tmp9_, NULL, FALSE);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _page_view_scan_direction_changed_cb_page_scan_direction_changed, self);
-#line 29 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_page_unref0 (self->priv->_page);
-#line 32 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_g_object_unref0 (self->priv->image);
 #line 6870 "page-view.c"
 }
@@ -6887,9 +6887,9 @@ GType page_view_get_type (void) {
 gpointer page_view_ref (gpointer instance) {
 	PageView* self;
 	self = instance;
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return instance;
 #line 6895 "page-view.c"
 }
@@ -6898,11 +6898,11 @@ gpointer page_view_ref (gpointer instance) {
 void page_view_unref (gpointer instance) {
 	PageView* self;
 	self = instance;
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		PAGE_VIEW_GET_CLASS (self)->finalize (self);
-#line 26 "/home/bob/bzr/simple-scan/3.16/src/page-view.vala"
+#line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 6908 "page-view.c"
 	}
diff --git a/src/page.c b/src/page.c
index 4cd830d..417f870 100644
--- a/src/page.c
+++ b/src/page.c
@@ -307,73 +307,73 @@ Page* page_construct (GType object_type, gint width, gint height, gint dpi, Scan
 	ScanDirection _tmp1_ = 0;
 	gint _tmp7_ = 0;
 	ScanDirection _tmp8_ = 0;
-#line 174 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self = (Page*) g_type_create_instance (object_type);
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = scan_direction;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp1_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = TRUE;
 #line 319 "page.c"
 	} else {
 		ScanDirection _tmp2_ = 0;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = scan_direction;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp2_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
 #line 326 "page.c"
 	}
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp0_) {
 #line 330 "page.c"
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 178 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = width;
-#line 178 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_set_scan_width (self, _tmp3_);
-#line 179 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = height;
-#line 179 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_set_scan_height (self, _tmp4_);
 #line 341 "page.c"
 	} else {
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 183 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = height;
-#line 183 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_set_scan_width (self, _tmp5_);
-#line 184 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = width;
-#line 184 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_set_scan_height (self, _tmp6_);
 #line 353 "page.c"
 	}
-#line 186 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = dpi;
-#line 186 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_dpi (self, _tmp7_);
-#line 187 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = scan_direction;
-#line 187 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_scan_direction (self, _tmp8_);
-#line 174 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return self;
 #line 365 "page.c"
 }
 
 
 Page* page_new (gint width, gint height, gint dpi, ScanDirection scan_direction) {
-#line 174 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return page_construct (TYPE_PAGE, width, height, dpi, scan_direction);
 #line 372 "page.c"
 }
 
 
 static guchar* _vala_array_dup3 (guchar* self, int length) {
-#line 215 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return g_memdup (self, length * sizeof (guchar));
 #line 379 "page.c"
 }
@@ -402,98 +402,98 @@ Page* page_construct_from_data (GType object_type, gint scan_width, gint scan_he
 	gint _tmp15_ = 0;
 	gint _tmp16_ = 0;
 	gint _tmp17_ = 0;
-#line 190 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self = (Page*) g_type_create_instance (object_type);
-#line 206 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 206 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = scan_width;
-#line 206 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 206 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_scan_width (self, _tmp0_);
-#line 207 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 207 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = scan_height;
-#line 207 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 207 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_scan_height (self, _tmp1_);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = scan_height;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->expected_rows = _tmp2_;
-#line 209 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = rowstride;
-#line 209 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_rowstride (self, _tmp3_);
-#line 210 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = n_channels;
-#line 210 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 210 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_n_channels (self, _tmp4_);
-#line 211 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp5_ = depth;
-#line 211 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_depth (self, _tmp5_);
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp6_ = dpi;
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_dpi (self, _tmp6_);
-#line 213 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = scan_direction;
-#line 213 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_scan_direction (self, _tmp7_);
-#line 214 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = color_profile;
-#line 214 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_color_profile (self, _tmp8_);
-#line 215 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp9_ = pixels;
-#line 215 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp9__length1 = pixels_length1;
-#line 215 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp10_ = (_tmp9_ != NULL) ? _vala_array_dup3 (_tmp9_, _tmp9__length1) : ((gpointer) _tmp9_);
-#line 215 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp10__length1 = _tmp9__length1;
-#line 215 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->pixels = (g_free (self->priv->pixels), NULL);
-#line 215 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->pixels = _tmp10_;
-#line 215 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->pixels_length1 = _tmp10__length1;
-#line 215 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_pixels_size_ = self->priv->pixels_length1;
-#line 216 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp11_ = pixels;
-#line 216 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp11__length1 = pixels_length1;
-#line 216 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_has_data (self, _tmp11_ != NULL);
-#line 217 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp12_ = has_crop;
-#line 217 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_has_crop (self, _tmp12_);
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp13_ = crop_name;
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_name (self, _tmp13_);
-#line 219 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp14_ = crop_x;
-#line 219 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_x (self, _tmp14_);
-#line 220 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp15_ = crop_y;
-#line 220 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_y (self, _tmp15_);
-#line 221 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp16_ = crop_width;
-#line 221 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 221 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_width (self, _tmp16_);
-#line 222 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp17_ = crop_height;
-#line 222 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_height (self, _tmp17_);
-#line 190 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return self;
 #line 492 "page.c"
 }
 
 
 Page* page_new_from_data (gint scan_width, gint scan_height, gint rowstride, gint n_channels, gint depth, gint dpi, ScanDirection scan_direction, const gchar* color_profile, guchar* pixels, int pixels_length1, gboolean has_crop, const gchar* crop_name, gint crop_x, gint crop_y, gint crop_width, gint crop_height) {
-#line 190 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return page_construct_from_data (TYPE_PAGE, scan_width, scan_height, rowstride, n_channels, depth, dpi, scan_direction, color_profile, pixels, pixels_length1, has_crop, crop_name, crop_x, crop_y, crop_width, crop_height);
 #line 499 "page.c"
 }
@@ -522,104 +522,104 @@ void page_set_page_info (Page* self, ScanPageInfo* info) {
 	guchar* _tmp20_ = NULL;
 	gint _tmp20__length1 = 0;
 	gint _tmp21_ = 0;
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (info != NULL);
-#line 227 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = info;
-#line 227 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _tmp0_->height;
-#line 227 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 227 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->expected_rows = _tmp1_;
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = info;
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = _tmp2_->dpi;
-#line 228 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_dpi (self, (gint) _tmp3_);
-#line 231 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = info;
-#line 231 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp5_ = _tmp4_->width;
-#line 231 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_scan_width (self, _tmp5_);
-#line 232 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp6_ = info;
-#line 232 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = _tmp6_->height;
-#line 232 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 232 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_scan_height (self, _tmp7_);
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = self->priv->_scan_height;
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp8_ < 0) {
 #line 558 "page.c"
 		gint _tmp9_ = 0;
-#line 235 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp9_ = self->priv->_scan_width;
-#line 235 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_set_scan_height (self, _tmp9_ / 2);
 #line 564 "page.c"
 	}
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp10_ = info;
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp11_ = _tmp10_->depth;
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_depth (self, _tmp11_);
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp12_ = info;
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp13_ = _tmp12_->n_channels;
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_n_channels (self, _tmp13_);
-#line 238 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp14_ = self->priv->_scan_width;
-#line 238 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp15_ = self->priv->_depth;
-#line 238 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp16_ = self->priv->_n_channels;
-#line 238 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_rowstride (self, (((_tmp14_ * _tmp15_) * _tmp16_) + 7) / 8);
-#line 239 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp17_ = self->priv->_scan_height;
-#line 239 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp18_ = self->priv->_rowstride;
-#line 239 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp19_ = _tmp17_ * _tmp18_;
-#line 239 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->pixels = g_renew (guchar, self->priv->pixels, _tmp17_ * _tmp18_);
-#line 239 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	(_tmp19_ > self->priv->pixels_length1) ? memset (self->priv->pixels + self->priv->pixels_length1, 0, sizeof (guchar) * (_tmp19_ - self->priv->pixels_length1)) : NULL;
-#line 239 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->pixels_length1 = _tmp19_;
-#line 239 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_pixels_size_ = _tmp19_;
-#line 240 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp20_ = self->priv->pixels;
-#line 240 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp20__length1 = self->priv->pixels_length1;
-#line 240 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp20_ != NULL);
-#line 243 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp21_ = self->priv->_depth;
-#line 243 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 243 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp21_ == 1) {
 #line 610 "page.c"
 		guchar* _tmp22_ = NULL;
 		gint _tmp22__length1 = 0;
 		gint _tmp23_ = 0;
 		gint _tmp24_ = 0;
-#line 244 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp22_ = self->priv->pixels;
-#line 244 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp22__length1 = self->priv->pixels_length1;
-#line 244 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp23_ = self->priv->_scan_height;
-#line 244 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp24_ = self->priv->_rowstride;
-#line 244 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		memset (_tmp22_, 0x00, (gsize) (_tmp23_ * _tmp24_));
 #line 625 "page.c"
 	} else {
@@ -627,32 +627,32 @@ void page_set_page_info (Page* self, ScanPageInfo* info) {
 		gint _tmp25__length1 = 0;
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp25_ = self->priv->pixels;
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp25__length1 = self->priv->pixels_length1;
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp26_ = self->priv->_scan_height;
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp27_ = self->priv->_rowstride;
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		memset (_tmp25_, 0xFF, (gsize) (_tmp26_ * _tmp27_));
 #line 641 "page.c"
 	}
-#line 248 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "size-changed");
-#line 249 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 249 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "pixels-changed");
 #line 647 "page.c"
 }
 
 
 void page_start (Page* self) {
-#line 252 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 254 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_is_scanning (self, TRUE);
-#line 255 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 255 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-line-changed");
 #line 658 "page.c"
 }
@@ -672,21 +672,21 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_
 	ScanLine* _tmp16_ = NULL;
 	gint _tmp17_ = 0;
 	gint _tmp32_ = 0;
-#line 258 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 258 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (line != NULL);
-#line 260 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = line;
-#line 260 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _tmp0_->number;
-#line 260 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = n;
-#line 260 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	line_number = _tmp1_ + _tmp2_;
-#line 263 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_vala_size_changed = FALSE;
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	while (TRUE) {
 #line 692 "page.c"
 		gint _tmp3_ = 0;
@@ -700,75 +700,75 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
 		gint _tmp12_ = 0;
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = line_number;
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = self->priv->_scan_height;
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (!(_tmp3_ >= _tmp4_)) {
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
 #line 712 "page.c"
 		}
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = self->priv->_scan_height;
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		rows = _tmp5_;
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = rows;
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp7_ = self->priv->_scan_width;
-#line 268 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_set_scan_height (self, _tmp6_ + (_tmp7_ / 2));
-#line 269 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp8_ = rows;
-#line 269 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp9_ = self->priv->_scan_height;
-#line 269 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_debug ("page.vala:269: Extending image from %d lines to %d lines", _tmp8_, _tmp9_);
-#line 270 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp10_ = self->priv->_scan_height;
-#line 270 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp11_ = self->priv->_rowstride;
-#line 270 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp12_ = _tmp10_ * _tmp11_;
-#line 270 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->pixels = g_renew (guchar, self->priv->pixels, _tmp10_ * _tmp11_);
-#line 270 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		(_tmp12_ > self->priv->pixels_length1) ? memset (self->priv->pixels + self->priv->pixels_length1, 0, sizeof (guchar) * (_tmp12_ - self->priv->pixels_length1)) : NULL;
-#line 270 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->pixels_length1 = _tmp12_;
-#line 270 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->_pixels_size_ = _tmp12_;
-#line 272 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_vala_size_changed = TRUE;
 #line 746 "page.c"
 	}
-#line 276 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp13_ = line_number;
-#line 276 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp14_ = self->priv->_rowstride;
-#line 276 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	offset = _tmp13_ * _tmp14_;
-#line 277 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp15_ = n;
-#line 277 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp16_ = line;
-#line 277 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp17_ = _tmp16_->data_length;
-#line 277 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	line_offset = _tmp15_ * _tmp17_;
 #line 762 "page.c"
 	{
 		gint i = 0;
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		i = 0;
 #line 767 "page.c"
 		{
 			gboolean _tmp18_ = FALSE;
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp18_ = TRUE;
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			while (TRUE) {
 #line 774 "page.c"
 				gint _tmp20_ = 0;
@@ -785,65 +785,65 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_
 				gint _tmp29_ = 0;
 				guchar _tmp30_ = '\0';
 				guchar _tmp31_ = '\0';
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (!_tmp18_) {
 #line 791 "page.c"
 					gint _tmp19_ = 0;
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp19_ = i;
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					i = _tmp19_ + 1;
 #line 797 "page.c"
 				}
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp18_ = FALSE;
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp20_ = i;
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp21_ = line;
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp22_ = _tmp21_->data_length;
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (!(_tmp20_ < _tmp22_)) {
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					break;
 #line 811 "page.c"
 				}
-#line 279 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp23_ = self->priv->pixels;
-#line 279 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp23__length1 = self->priv->pixels_length1;
-#line 279 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp24_ = offset;
-#line 279 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp25_ = i;
-#line 279 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp26_ = line;
-#line 279 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp27_ = _tmp26_->data;
-#line 279 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp27__length1 = _tmp26_->data_length1;
-#line 279 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp28_ = line_offset;
-#line 279 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp29_ = i;
-#line 279 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp30_ = _tmp27_[_tmp28_ + _tmp29_];
-#line 279 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp23_[_tmp24_ + _tmp25_] = _tmp30_;
-#line 279 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp31_ = _tmp23_[_tmp24_ + _tmp25_];
 #line 837 "page.c"
 			}
 		}
 	}
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp32_ = line_number;
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_scan_line (self, _tmp32_);
-#line 258 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (size_changed) {
-#line 258 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*size_changed = _vala_size_changed;
 #line 849 "page.c"
 	}
@@ -853,23 +853,23 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_
 void page_parse_scan_line (Page* self, ScanLine* line) {
 	gboolean size_has_changed = FALSE;
 	gboolean _tmp8_ = FALSE;
-#line 284 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 284 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (line != NULL);
-#line 286 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	size_has_changed = FALSE;
 #line 863 "page.c"
 	{
 		gint i = 0;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		i = 0;
 #line 868 "page.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp0_ = TRUE;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			while (TRUE) {
 #line 875 "page.c"
 				gint _tmp2_ = 0;
@@ -878,55 +878,55 @@ void page_parse_scan_line (Page* self, ScanLine* line) {
 				ScanLine* _tmp5_ = NULL;
 				gint _tmp6_ = 0;
 				gboolean _tmp7_ = FALSE;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (!_tmp0_) {
 #line 884 "page.c"
 					gint _tmp1_ = 0;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp1_ = i;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					i = _tmp1_ + 1;
 #line 890 "page.c"
 				}
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp0_ = FALSE;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp2_ = i;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp3_ = line;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp4_ = _tmp3_->n_lines;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (!(_tmp2_ < _tmp4_)) {
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					break;
 #line 904 "page.c"
 				}
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp5_ = line;
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp6_ = i;
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				page_parse_line (self, _tmp5_, _tmp6_, &_tmp7_);
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				size_has_changed = _tmp7_;
 #line 914 "page.c"
 			}
 		}
 	}
-#line 290 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_has_data (self, TRUE);
-#line 292 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = size_has_changed;
-#line 292 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp8_) {
-#line 293 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_signal_emit_by_name (self, "size-changed");
 #line 926 "page.c"
 	}
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-line-changed");
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "pixels-changed");
 #line 932 "page.c"
 }
@@ -937,30 +937,30 @@ void page_finish (Page* self) {
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_ = 0;
 	gboolean _tmp11_ = FALSE;
-#line 298 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	size_has_changed = FALSE;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = self->priv->expected_rows;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp1_ < 0) {
 #line 949 "page.c"
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
-#line 304 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = self->priv->_scan_line;
-#line 304 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = self->priv->_scan_height;
-#line 304 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp2_ != _tmp3_;
 #line 958 "page.c"
 	} else {
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = FALSE;
 #line 962 "page.c"
 	}
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp0_) {
 #line 966 "page.c"
 		gint rows = 0;
@@ -971,51 +971,51 @@ void page_finish (Page* self) {
 		gint _tmp8_ = 0;
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = self->priv->_scan_height;
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		rows = _tmp4_;
-#line 307 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = self->priv->_scan_line;
-#line 307 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_set_scan_height (self, _tmp5_);
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = self->priv->_scan_height;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp7_ = self->priv->_rowstride;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp8_ = _tmp6_ * _tmp7_;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->pixels = g_renew (guchar, self->priv->pixels, _tmp6_ * _tmp7_);
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		(_tmp8_ > self->priv->pixels_length1) ? memset (self->priv->pixels + self->priv->pixels_length1, 0, sizeof (guchar) * (_tmp8_ - self->priv->pixels_length1)) : NULL;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->pixels_length1 = _tmp8_;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		self->priv->_pixels_size_ = _tmp8_;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp9_ = rows;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp10_ = self->priv->_scan_height;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_debug ("page.vala:309: Trimming page from %d lines to %d lines", _tmp9_, _tmp10_);
-#line 311 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		size_has_changed = TRUE;
 #line 1005 "page.c"
 	}
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_is_scanning (self, FALSE);
-#line 315 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp11_ = size_has_changed;
-#line 315 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp11_) {
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_signal_emit_by_name (self, "size-changed");
 #line 1015 "page.c"
 	}
-#line 317 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-line-changed");
-#line 318 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-finished");
 #line 1021 "page.c"
 }
@@ -1024,56 +1024,56 @@ void page_finish (Page* self) {
 void page_rotate_left (Page* self) {
 	ScanDirection _tmp0_ = 0;
 	ScanDirection _tmp1_ = 0;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = page_get_scan_direction (self);
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _tmp0_;
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	switch (_tmp1_) {
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
 #line 1038 "page.c"
 		{
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_scan_direction (self, SCAN_DIRECTION_LEFT_TO_RIGHT);
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
 #line 1044 "page.c"
 		}
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
 #line 1048 "page.c"
 		{
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_scan_direction (self, SCAN_DIRECTION_BOTTOM_TO_TOP);
-#line 330 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
 #line 1054 "page.c"
 		}
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
 #line 1058 "page.c"
 		{
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_scan_direction (self, SCAN_DIRECTION_RIGHT_TO_LEFT);
-#line 333 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
 #line 1064 "page.c"
 		}
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
 #line 1068 "page.c"
 		{
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_scan_direction (self, SCAN_DIRECTION_TOP_TO_BOTTOM);
-#line 336 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
 #line 1074 "page.c"
 		}
 		default:
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		break;
 #line 1079 "page.c"
 	}
@@ -1083,56 +1083,56 @@ void page_rotate_left (Page* self) {
 void page_rotate_right (Page* self) {
 	ScanDirection _tmp0_ = 0;
 	ScanDirection _tmp1_ = 0;
-#line 340 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 340 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = page_get_scan_direction (self);
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _tmp0_;
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	switch (_tmp1_) {
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
 #line 1097 "page.c"
 		{
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_scan_direction (self, SCAN_DIRECTION_RIGHT_TO_LEFT);
-#line 346 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
 #line 1103 "page.c"
 		}
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
 #line 1107 "page.c"
 		{
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_scan_direction (self, SCAN_DIRECTION_TOP_TO_BOTTOM);
-#line 349 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
 #line 1113 "page.c"
 		}
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
 #line 1117 "page.c"
 		{
-#line 351 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_scan_direction (self, SCAN_DIRECTION_LEFT_TO_RIGHT);
-#line 352 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
 #line 1123 "page.c"
 		}
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
 #line 1127 "page.c"
 		{
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_scan_direction (self, SCAN_DIRECTION_BOTTOM_TO_TOP);
-#line 355 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
 #line 1133 "page.c"
 		}
 		default:
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		break;
 #line 1138 "page.c"
 	}
@@ -1141,29 +1141,29 @@ void page_rotate_right (Page* self) {
 
 void page_set_no_crop (Page* self) {
 	gboolean _tmp0_ = FALSE;
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_has_crop;
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!_tmp0_) {
-#line 362 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
 #line 1153 "page.c"
 	}
-#line 363 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_has_crop (self, FALSE);
-#line 364 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_name (self, NULL);
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_x (self, 0);
-#line 366 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_y (self, 0);
-#line 367 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_width (self, 0);
-#line 368 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_height (self, 0);
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
 #line 1169 "page.c"
 }
@@ -1178,85 +1178,85 @@ void page_set_custom_crop (Page* self, gint width, gint height) {
 	const gchar* _tmp5_ = NULL;
 	gint _tmp11_ = 0;
 	gint _tmp12_ = 0;
-#line 372 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 374 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = width;
-#line 374 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp0_ >= 1);
-#line 375 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = height;
-#line 375 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp1_ >= 1);
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp5_ = self->priv->_crop_name;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp5_ == NULL) {
 #line 1196 "page.c"
 		gboolean _tmp6_ = FALSE;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = self->priv->_has_crop;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = _tmp6_;
 #line 1202 "page.c"
 	} else {
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = FALSE;
 #line 1206 "page.c"
 	}
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp4_) {
 #line 1210 "page.c"
 		gint _tmp7_ = 0;
 		gint _tmp8_ = 0;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp7_ = self->priv->_crop_width;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp8_ = width;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = _tmp7_ == _tmp8_;
 #line 1219 "page.c"
 	} else {
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = FALSE;
 #line 1223 "page.c"
 	}
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp3_) {
 #line 1227 "page.c"
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp9_ = self->priv->_crop_height;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp10_ = height;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = _tmp9_ == _tmp10_;
 #line 1236 "page.c"
 	} else {
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = FALSE;
 #line 1240 "page.c"
 	}
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp2_) {
-#line 378 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
 #line 1246 "page.c"
 	}
-#line 379 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_name (self, NULL);
-#line 380 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_has_crop (self, TRUE);
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp11_ = width;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_width (self, _tmp11_);
-#line 383 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp12_ = height;
-#line 383 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_height (self, _tmp12_);
-#line 396 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
 #line 1262 "page.c"
 }
@@ -1268,17 +1268,17 @@ void page_set_named_crop (Page* self, const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	GQuark _tmp3_ = 0U;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label0 = 0;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label1 = 0;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label2 = 0;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label3 = 0;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label4 = 0;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label5 = 0;
 #line 1284 "page.c"
 	const gchar* _tmp5_ = NULL;
@@ -1298,222 +1298,222 @@ void page_set_named_crop (Page* self, const gchar* name) {
 	gint _tmp20_ = 0;
 	gint _tmp23_ = 0;
 	gint _tmp24_ = 0;
-#line 399 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 399 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (name != NULL);
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = name;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _tmp0_;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("A4")))) {
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
 #line 1316 "page.c"
 			default:
 			{
-#line 405 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 405 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				w = 8.3;
-#line 406 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				h = 11.7;
-#line 407 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
 #line 1325 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("A5")))) {
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
 #line 1331 "page.c"
 			default:
 			{
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				w = 5.8;
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				h = 8.3;
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
 #line 1340 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("A6")))) {
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
 #line 1346 "page.c"
 			default:
 			{
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				w = 4.1;
-#line 414 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 414 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				h = 5.8;
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
 #line 1355 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("letter")))) {
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
 #line 1361 "page.c"
 			default:
 			{
-#line 417 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				w = 8.5;
-#line 418 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				h = (gdouble) 11;
-#line 419 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
 #line 1370 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label4) ? _tmp2_label4 : (_tmp2_label4 = g_quark_from_static_string ("legal")))) {
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
 #line 1376 "page.c"
 			default:
 			{
-#line 421 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				w = 8.5;
-#line 422 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				h = (gdouble) 14;
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
 #line 1385 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label5) ? _tmp2_label5 : (_tmp2_label5 = g_quark_from_static_string ("4x6")))) {
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
 #line 1391 "page.c"
 			default:
 			{
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				w = (gdouble) 4;
-#line 426 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				h = (gdouble) 6;
-#line 427 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
 #line 1400 "page.c"
 			}
 		}
 	} else {
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
 #line 1406 "page.c"
 			default:
 			{
 				const gchar* _tmp4_ = NULL;
-#line 429 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp4_ = name;
-#line 429 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				g_warning ("page.vala:429: Unknown paper size '%s'", _tmp4_);
-#line 430 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				return;
 #line 1416 "page.c"
 			}
 		}
 	}
-#line 433 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp5_ = name;
-#line 433 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_name (self, _tmp5_);
-#line 434 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 434 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_has_crop (self, TRUE);
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp6_ = page_get_width (self);
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = _tmp6_;
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	pw = _tmp7_;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = page_get_height (self);
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp9_ = _tmp8_;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	ph = _tmp9_;
-#line 440 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp10_ = pw;
-#line 440 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp11_ = ph;
-#line 440 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp10_ > _tmp11_) {
 #line 1444 "page.c"
 		gdouble t = 0.0;
 		gdouble _tmp12_ = 0.0;
 		gdouble _tmp13_ = 0.0;
 		gdouble _tmp14_ = 0.0;
-#line 442 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp12_ = w;
-#line 442 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		t = _tmp12_;
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp13_ = h;
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		w = _tmp13_;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp14_ = t;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		h = _tmp14_;
 #line 1461 "page.c"
 	}
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp15_ = w;
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp16_ = self->priv->_dpi;
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_width (self, (gint) ((_tmp15_ * _tmp16_) + 0.5));
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp17_ = h;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp18_ = self->priv->_dpi;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_height (self, (gint) ((_tmp17_ * _tmp18_) + 0.5));
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp19_ = self->priv->_crop_width;
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp20_ = pw;
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp19_ < _tmp20_) {
 #line 1481 "page.c"
 		gint _tmp21_ = 0;
 		gint _tmp22_ = 0;
-#line 452 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp21_ = pw;
-#line 452 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp22_ = self->priv->_crop_width;
-#line 452 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_set_crop_x (self, (_tmp21_ - _tmp22_) / 2);
 #line 1490 "page.c"
 	} else {
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_set_crop_x (self, 0);
 #line 1494 "page.c"
 	}
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp23_ = self->priv->_crop_height;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp24_ = ph;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp23_ < _tmp24_) {
 #line 1502 "page.c"
 		gint _tmp25_ = 0;
 		gint _tmp26_ = 0;
-#line 456 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp25_ = ph;
-#line 456 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp26_ = self->priv->_crop_height;
-#line 456 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_set_crop_y (self, (_tmp25_ - _tmp26_) / 2);
 #line 1511 "page.c"
 	} else {
-#line 458 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_set_crop_y (self, 0);
 #line 1515 "page.c"
 	}
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
 #line 1519 "page.c"
 }
@@ -1530,41 +1530,41 @@ void page_move_crop (Page* self, gint x, gint y) {
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
 	gint _tmp9_ = 0;
-#line 462 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 464 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = x;
-#line 464 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp0_ >= 0);
-#line 465 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = y;
-#line 465 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp1_ >= 0);
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = x;
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = page_get_width (self);
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = _tmp3_;
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp2_ < _tmp4_);
-#line 467 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp5_ = y;
-#line 467 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp6_ = page_get_height (self);
-#line 467 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = _tmp6_;
-#line 467 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (_tmp5_ < _tmp7_);
-#line 469 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = x;
-#line 469 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_x (self, _tmp8_);
-#line 470 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp9_ = y;
-#line 470 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_y (self, _tmp9_);
-#line 471 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
 #line 1570 "page.c"
 }
@@ -1577,31 +1577,31 @@ void page_rotate_crop (Page* self) {
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
 	const gchar* _tmp4_ = NULL;
-#line 474 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_has_crop;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!_tmp0_) {
-#line 477 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
 #line 1589 "page.c"
 	}
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = self->priv->_crop_width;
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	t = _tmp1_;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = self->priv->_crop_height;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_width (self, _tmp2_);
-#line 481 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = t;
-#line 481 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_height (self, _tmp3_);
-#line 484 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = self->priv->_crop_name;
-#line 484 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 484 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp4_ == NULL) {
 #line 1607 "page.c"
 		gint w = 0;
@@ -1618,86 +1618,86 @@ void page_rotate_crop (Page* self) {
 		gint _tmp17_ = 0;
 		gint _tmp18_ = 0;
 		gint _tmp21_ = 0;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = page_get_width (self);
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = _tmp5_;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		w = _tmp6_;
-#line 487 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp7_ = page_get_height (self);
-#line 487 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp8_ = _tmp7_;
-#line 487 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		h = _tmp8_;
-#line 489 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp9_ = self->priv->_crop_x;
-#line 489 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp10_ = self->priv->_crop_width;
-#line 489 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp11_ = w;
-#line 489 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if ((_tmp9_ + _tmp10_) > _tmp11_) {
 #line 1642 "page.c"
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp12_ = w;
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp13_ = self->priv->_crop_width;
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_crop_x (self, _tmp12_ - _tmp13_);
 #line 1651 "page.c"
 		}
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp14_ = self->priv->_crop_x;
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp14_ < 0) {
 #line 1657 "page.c"
 			gint _tmp15_ = 0;
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_crop_x (self, 0);
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp15_ = w;
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_crop_width (self, _tmp15_);
 #line 1665 "page.c"
 		}
-#line 496 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp16_ = self->priv->_crop_y;
-#line 496 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp17_ = self->priv->_crop_height;
-#line 496 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp18_ = h;
-#line 496 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 496 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if ((_tmp16_ + _tmp17_) > _tmp18_) {
 #line 1675 "page.c"
 			gint _tmp19_ = 0;
 			gint _tmp20_ = 0;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp19_ = h;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp20_ = self->priv->_crop_height;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_crop_y (self, _tmp19_ - _tmp20_);
 #line 1684 "page.c"
 		}
-#line 498 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp21_ = self->priv->_crop_y;
-#line 498 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp21_ < 0) {
 #line 1690 "page.c"
 			gint _tmp22_ = 0;
-#line 500 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_crop_y (self, 0);
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp22_ = h;
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_crop_height (self, _tmp22_);
 #line 1698 "page.c"
 		}
 	}
-#line 505 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
 #line 1703 "page.c"
 }
@@ -1709,25 +1709,25 @@ guchar* page_get_pixels (Page* self, int* result_length1) {
 	gint _tmp0__length1 = 0;
 	guchar* _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 508 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->pixels;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0__length1 = self->priv->pixels_length1;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _tmp0_;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (result_length1) {
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*result_length1 = _tmp1__length1;
 #line 1727 "page.c"
 	}
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp1_;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 1733 "page.c"
 }
@@ -1735,11 +1735,11 @@ guchar* page_get_pixels (Page* self, int* result_length1) {
 
 static guchar page_get_sample (Page* self, guchar* pixels, int pixels_length1, gint offset, gint x, gint depth, gint n_channels, gint channel) {
 	guchar result = '\0';
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 517 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = (guchar) 0xFF;
-#line 517 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 517 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 1745 "page.c"
 }
@@ -1786,23 +1786,23 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 	gint _tmp122_ = 0;
 	guchar _tmp123_ = '\0';
 	guchar _tmp124_ = '\0';
-#line 521 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 521 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 523 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = page_get_scan_direction (self);
-#line 523 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _tmp0_;
-#line 523 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	switch (_tmp1_) {
-#line 523 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
 #line 1800 "page.c"
 		{
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
 #line 1804 "page.c"
 		}
-#line 523 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
 #line 1808 "page.c"
 		{
@@ -1810,23 +1810,23 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 			gint _tmp3_ = 0;
 			gint _tmp4_ = 0;
 			gint _tmp5_ = 0;
-#line 528 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp2_ = self->priv->_scan_width;
-#line 528 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp3_ = x;
-#line 528 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			x = (_tmp2_ - _tmp3_) - 1;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp4_ = self->priv->_scan_height;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp5_ = y;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			y = (_tmp4_ - _tmp5_) - 1;
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
 #line 1828 "page.c"
 		}
-#line 523 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
 #line 1832 "page.c"
 		{
@@ -1835,25 +1835,25 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
-#line 532 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp6_ = x;
-#line 532 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			t = _tmp6_;
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp7_ = self->priv->_scan_width;
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp8_ = y;
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			x = (_tmp7_ - _tmp8_) - 1;
-#line 534 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp9_ = t;
-#line 534 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			y = _tmp9_;
-#line 535 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
 #line 1855 "page.c"
 		}
-#line 523 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
 #line 1859 "page.c"
 		{
@@ -1862,52 +1862,52 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 			gint _tmp11_ = 0;
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp10_ = x;
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			t = _tmp10_;
-#line 538 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp11_ = y;
-#line 538 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			x = _tmp11_;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp12_ = self->priv->_scan_height;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp13_ = t;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			y = (_tmp12_ - _tmp13_) - 1;
-#line 540 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
 #line 1882 "page.c"
 		}
 		default:
-#line 523 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		break;
 #line 1887 "page.c"
 	}
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp14_ = self->priv->_rowstride;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp15_ = y;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	line_offset = _tmp14_ * _tmp15_;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp17_ = self->priv->_depth;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp17_ == 8) {
 #line 1899 "page.c"
 		gint _tmp18_ = 0;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp18_ = self->priv->_n_channels;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp16_ = _tmp18_ == 3;
 #line 1905 "page.c"
 	} else {
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp16_ = FALSE;
 #line 1909 "page.c"
 	}
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp16_) {
 #line 1913 "page.c"
 		gint o = 0;
@@ -1938,91 +1938,91 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 		gint _tmp37_ = 0;
 		guchar _tmp38_ = '\0';
 		guchar _tmp39_ = '\0';
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp19_ = line_offset;
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp20_ = x;
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp21_ = self->priv->_n_channels;
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		o = _tmp19_ + (_tmp20_ * _tmp21_);
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp22_ = pixel;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp22__length1 = pixel_length1;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp23_ = offset;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp24_ = self->priv->pixels;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp24__length1 = self->priv->pixels_length1;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp25_ = o;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp26_ = _tmp24_[_tmp25_];
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp22_[_tmp23_ + 0] = _tmp26_;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp27_ = _tmp22_[_tmp23_ + 0];
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp28_ = pixel;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp28__length1 = pixel_length1;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp29_ = offset;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp30_ = self->priv->pixels;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp30__length1 = self->priv->pixels_length1;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp31_ = o;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp32_ = _tmp30_[_tmp31_ + 1];
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp28_[_tmp29_ + 1] = _tmp32_;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp33_ = _tmp28_[_tmp29_ + 1];
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp34_ = pixel;
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp34__length1 = pixel_length1;
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp35_ = offset;
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp36_ = self->priv->pixels;
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp36__length1 = self->priv->pixels_length1;
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp37_ = o;
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp38_ = _tmp36_[_tmp37_ + 2];
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp34_[_tmp35_ + 2] = _tmp38_;
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp39_ = _tmp34_[_tmp35_ + 2];
-#line 552 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
 #line 2006 "page.c"
 	} else {
 		gboolean _tmp40_ = FALSE;
 		gint _tmp41_ = 0;
-#line 554 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp41_ = self->priv->_depth;
-#line 554 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp41_ == 8) {
 #line 2014 "page.c"
 			gint _tmp42_ = 0;
-#line 554 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp42_ = self->priv->_n_channels;
-#line 554 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp40_ = _tmp42_ == 1;
 #line 2020 "page.c"
 		} else {
-#line 554 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp40_ = FALSE;
 #line 2024 "page.c"
 		}
-#line 554 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp40_) {
 #line 2028 "page.c"
 			guchar p = '\0';
@@ -2044,73 +2044,73 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 			guchar _tmp54_ = '\0';
 			guchar _tmp55_ = '\0';
 			guchar _tmp56_ = '\0';
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp43_ = self->priv->pixels;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp43__length1 = self->priv->pixels_length1;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp44_ = line_offset;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp45_ = x;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp46_ = _tmp43_[_tmp44_ + _tmp45_];
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			p = _tmp46_;
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp47_ = pixel;
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp47__length1 = pixel_length1;
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp48_ = offset;
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp49_ = pixel;
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp49__length1 = pixel_length1;
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp50_ = offset;
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp51_ = pixel;
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp51__length1 = pixel_length1;
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp52_ = offset;
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp53_ = p;
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp51_[_tmp52_ + 2] = _tmp53_;
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp54_ = _tmp51_[_tmp52_ + 2];
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp49_[_tmp50_ + 1] = _tmp54_;
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp55_ = _tmp49_[_tmp50_ + 1];
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp47_[_tmp48_ + 0] = _tmp55_;
-#line 557 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp56_ = _tmp47_[_tmp48_ + 0];
-#line 558 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return;
 #line 2094 "page.c"
 		} else {
 			gboolean _tmp57_ = FALSE;
 			gint _tmp58_ = 0;
-#line 562 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp58_ = self->priv->_depth;
-#line 562 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			if (_tmp58_ == 1) {
 #line 2102 "page.c"
 				gint _tmp59_ = 0;
-#line 562 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp59_ = self->priv->_n_channels;
-#line 562 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp57_ = _tmp59_ == 1;
 #line 2108 "page.c"
 			} else {
-#line 562 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp57_ = FALSE;
 #line 2112 "page.c"
 			}
-#line 562 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			if (_tmp57_) {
 #line 2116 "page.c"
 				guchar p = '\0';
@@ -2134,85 +2134,85 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 				guchar _tmp73_ = '\0';
 				guchar _tmp74_ = '\0';
 				guchar _tmp75_ = '\0';
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp60_ = self->priv->pixels;
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp60__length1 = self->priv->pixels_length1;
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp61_ = line_offset;
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp62_ = x;
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp63_ = _tmp60_[_tmp61_ + (_tmp62_ / 8)];
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				p = _tmp63_;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp65_ = p;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp66_ = x;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (((gint) (_tmp65_ & (0x80 >> (_tmp66_ % 8)))) != 0) {
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp64_ = 0x00;
 #line 2158 "page.c"
 				} else {
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp64_ = 0xFF;
 #line 2162 "page.c"
 				}
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp67_ = pixel;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp67__length1 = pixel_length1;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp68_ = offset;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp69_ = pixel;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp69__length1 = pixel_length1;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp70_ = offset;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp71_ = pixel;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp71__length1 = pixel_length1;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp72_ = offset;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp71_[_tmp72_ + 2] = (guchar) _tmp64_;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp73_ = _tmp71_[_tmp72_ + 2];
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp69_[_tmp70_ + 1] = _tmp73_;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp74_ = _tmp69_[_tmp70_ + 1];
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp67_[_tmp68_ + 0] = _tmp74_;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp75_ = _tmp67_[_tmp68_ + 0];
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				return;
 #line 2196 "page.c"
 			} else {
 				gboolean _tmp76_ = FALSE;
 				gint _tmp77_ = 0;
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp77_ = self->priv->_depth;
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (_tmp77_ == 2) {
 #line 2204 "page.c"
 					gint _tmp78_ = 0;
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp78_ = self->priv->_n_channels;
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp76_ = _tmp78_ == 1;
 #line 2210 "page.c"
 				} else {
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp76_ = FALSE;
 #line 2214 "page.c"
 				}
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (_tmp76_) {
 #line 2218 "page.c"
 					gint block_shift[4] = {0};
@@ -2241,150 +2241,150 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 					guchar _tmp95_ = '\0';
 					guchar _tmp96_ = '\0';
 					guchar _tmp97_ = '\0';
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp79_[0] = 6;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp79_[1] = 4;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp79_[2] = 2;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp79_[3] = 0;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					memcpy (block_shift, _tmp79_, 4 * sizeof (gint));
-#line 574 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp80_ = self->priv->pixels;
-#line 574 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp80__length1 = self->priv->pixels_length1;
-#line 574 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp81_ = line_offset;
-#line 574 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp82_ = x;
-#line 574 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp83_ = _tmp80_[_tmp81_ + (_tmp82_ / 4)];
-#line 574 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					p = _tmp83_;
-#line 575 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp84_ = p;
-#line 575 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp85_ = x;
-#line 575 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp86_ = block_shift[_tmp85_ % 4];
-#line 575 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					sample = (_tmp84_ >> _tmp86_) & 0x3;
-#line 576 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp87_ = sample;
-#line 576 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					sample = (_tmp87_ * 255) / 3;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp88_ = pixel;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp88__length1 = pixel_length1;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp89_ = offset;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp90_ = pixel;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp90__length1 = pixel_length1;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp91_ = offset;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp92_ = pixel;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp92__length1 = pixel_length1;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp93_ = offset;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp94_ = sample;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp92_[_tmp93_ + 2] = (guchar) _tmp94_;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp95_ = _tmp92_[_tmp93_ + 2];
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp90_[_tmp91_ + 1] = _tmp95_;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp96_ = _tmp90_[_tmp91_ + 1];
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp88_[_tmp89_ + 0] = _tmp96_;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp97_ = _tmp88_[_tmp89_ + 0];
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					return;
 #line 2313 "page.c"
 				}
 			}
 		}
 	}
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp98_ = pixel;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp98__length1 = pixel_length1;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp99_ = offset;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp100_ = self->priv->pixels;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp100__length1 = self->priv->pixels_length1;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp101_ = line_offset;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp102_ = x;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp103_ = self->priv->_depth;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp104_ = self->priv->_n_channels;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp105_ = page_get_sample (self, _tmp100_, _tmp100__length1, _tmp101_, _tmp102_, _tmp103_, _tmp104_, 0);
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp98_[_tmp99_ + 0] = _tmp105_;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp106_ = _tmp98_[_tmp99_ + 0];
-#line 584 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp107_ = pixel;
-#line 584 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp107__length1 = pixel_length1;
-#line 584 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp108_ = offset;
-#line 584 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp109_ = self->priv->pixels;
-#line 584 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp109__length1 = self->priv->pixels_length1;
-#line 584 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp110_ = line_offset;
-#line 584 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp111_ = x;
-#line 584 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp112_ = self->priv->_depth;
-#line 584 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp113_ = self->priv->_n_channels;
-#line 584 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp114_ = page_get_sample (self, _tmp109_, _tmp109__length1, _tmp110_, _tmp111_, _tmp112_, _tmp113_, 1);
-#line 584 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp107_[_tmp108_ + 1] = _tmp114_;
-#line 584 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp115_ = _tmp107_[_tmp108_ + 1];
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp116_ = pixel;
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp116__length1 = pixel_length1;
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp117_ = offset;
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp118_ = self->priv->pixels;
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp118__length1 = self->priv->pixels_length1;
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp119_ = line_offset;
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp120_ = x;
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp121_ = self->priv->_depth;
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp122_ = self->priv->_n_channels;
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp123_ = page_get_sample (self, _tmp118_, _tmp118__length1, _tmp119_, _tmp120_, _tmp121_, _tmp122_, 2);
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp116_[_tmp117_ + 2] = _tmp123_;
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp124_ = _tmp116_[_tmp117_ + 2];
 #line 2390 "page.c"
 }
@@ -2409,25 +2409,25 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) {
 	guint8* _tmp31_ = NULL;
 	gint image_pixels_length1 = 0;
 	gint _image_pixels_size_ = 0;
-#line 588 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = apply_crop;
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp1_) {
 #line 2419 "page.c"
 		gboolean _tmp2_ = FALSE;
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = self->priv->_has_crop;
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp2_;
 #line 2425 "page.c"
 	} else {
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = FALSE;
 #line 2429 "page.c"
 	}
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp0_) {
 #line 2433 "page.c"
 		gint _tmp3_ = 0;
@@ -2444,77 +2444,77 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) {
 		gint _tmp16_ = 0;
 		gint _tmp17_ = 0;
 		gint _tmp18_ = 0;
-#line 593 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = self->priv->_crop_x;
-#line 593 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		l = _tmp3_;
-#line 594 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = l;
-#line 594 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = self->priv->_crop_width;
-#line 594 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		r = _tmp4_ + _tmp5_;
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = self->priv->_crop_y;
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		t = _tmp6_;
-#line 596 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp7_ = t;
-#line 596 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp8_ = self->priv->_crop_height;
-#line 596 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		b = _tmp7_ + _tmp8_;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp9_ = l;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp9_ < 0) {
-#line 599 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			l = 0;
 #line 2474 "page.c"
 		}
-#line 600 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp10_ = r;
-#line 600 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp11_ = page_get_width (self);
-#line 600 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp12_ = _tmp11_;
-#line 600 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp10_ > _tmp12_) {
 #line 2484 "page.c"
 			gint _tmp13_ = 0;
 			gint _tmp14_ = 0;
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp13_ = page_get_width (self);
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp14_ = _tmp13_;
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			r = _tmp14_;
 #line 2493 "page.c"
 		}
-#line 602 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp15_ = t;
-#line 602 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp15_ < 0) {
-#line 603 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			t = 0;
 #line 2501 "page.c"
 		}
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp16_ = b;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp17_ = page_get_height (self);
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp18_ = _tmp17_;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp16_ > _tmp18_) {
 #line 2511 "page.c"
 			gint _tmp19_ = 0;
 			gint _tmp20_ = 0;
-#line 605 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp19_ = page_get_height (self);
-#line 605 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp20_ = _tmp19_;
-#line 605 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			b = _tmp20_;
 #line 2520 "page.c"
 		}
@@ -2523,60 +2523,60 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) {
 		gint _tmp22_ = 0;
 		gint _tmp23_ = 0;
 		gint _tmp24_ = 0;
-#line 609 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		l = 0;
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp21_ = page_get_width (self);
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp22_ = _tmp21_;
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		r = _tmp22_;
-#line 611 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		t = 0;
-#line 612 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp23_ = page_get_height (self);
-#line 612 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp24_ = _tmp23_;
-#line 612 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		b = _tmp24_;
 #line 2543 "page.c"
 	}
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp25_ = r;
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp26_ = l;
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp27_ = b;
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp28_ = t;
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp29_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, _tmp25_ - _tmp26_, _tmp27_ - _tmp28_);
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	image = _tmp29_;
-#line 616 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp30_ = image;
-#line 616 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp31_ = gdk_pixbuf_get_pixels (_tmp30_);
-#line 616 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	image_pixels = _tmp31_;
-#line 616 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	image_pixels_length1 = -1;
-#line 616 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_image_pixels_size_ = image_pixels_length1;
 #line 2567 "page.c"
 	{
 		gint y = 0;
 		gint _tmp32_ = 0;
-#line 617 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp32_ = t;
-#line 617 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		y = _tmp32_;
 #line 2575 "page.c"
 		{
 			gboolean _tmp33_ = FALSE;
-#line 617 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp33_ = TRUE;
-#line 617 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			while (TRUE) {
 #line 2582 "page.c"
 				gint _tmp35_ = 0;
@@ -2586,52 +2586,52 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) {
 				gint _tmp38_ = 0;
 				gint _tmp39_ = 0;
 				gint _tmp40_ = 0;
-#line 617 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (!_tmp33_) {
 #line 2592 "page.c"
 					gint _tmp34_ = 0;
-#line 617 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp34_ = y;
-#line 617 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					y = _tmp34_ + 1;
 #line 2598 "page.c"
 				}
-#line 617 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp33_ = FALSE;
-#line 617 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp35_ = y;
-#line 617 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp36_ = b;
-#line 617 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (!(_tmp35_ < _tmp36_)) {
-#line 617 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					break;
 #line 2610 "page.c"
 				}
-#line 619 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp37_ = image;
-#line 619 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp38_ = gdk_pixbuf_get_rowstride (_tmp37_);
-#line 619 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp39_ = y;
-#line 619 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp40_ = t;
-#line 619 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				offset = _tmp38_ * (_tmp39_ - _tmp40_);
 #line 2622 "page.c"
 				{
 					gint x = 0;
 					gint _tmp41_ = 0;
-#line 620 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp41_ = l;
-#line 620 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					x = _tmp41_;
 #line 2630 "page.c"
 					{
 						gboolean _tmp42_ = FALSE;
-#line 620 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 						_tmp42_ = TRUE;
-#line 620 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 						while (TRUE) {
 #line 2637 "page.c"
 							gint _tmp44_ = 0;
@@ -2643,43 +2643,43 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) {
 							gint _tmp49_ = 0;
 							gint _tmp50_ = 0;
 							gint _tmp51_ = 0;
-#line 620 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							if (!_tmp42_) {
 #line 2649 "page.c"
 								gint _tmp43_ = 0;
-#line 620 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 								_tmp43_ = x;
-#line 620 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 								x = _tmp43_ + 1;
 #line 2655 "page.c"
 							}
-#line 620 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp42_ = FALSE;
-#line 620 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp44_ = x;
-#line 620 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp45_ = r;
-#line 620 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							if (!(_tmp44_ < _tmp45_)) {
-#line 620 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 								break;
 #line 2667 "page.c"
 							}
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp46_ = x;
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp47_ = y;
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp48_ = image_pixels;
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp48__length1 = image_pixels_length1;
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp49_ = offset;
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp50_ = x;
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							_tmp51_ = l;
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 							page_get_pixel (self, _tmp46_, _tmp47_, _tmp48_, _tmp48__length1, _tmp49_ + ((_tmp50_ - _tmp51_) * 3));
 #line 2685 "page.c"
 						}
@@ -2688,9 +2688,9 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) {
 			}
 		}
 	}
-#line 624 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = image;
-#line 624 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 2696 "page.c"
 }
@@ -2768,23 +2768,23 @@ static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_fi
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (icc_profile_filename != NULL, NULL);
 #line 2776 "page.c"
 	{
 		const gchar* _tmp0_ = NULL;
 		gchar* _tmp1_ = NULL;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = icc_profile_filename;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_file_get_contents (_tmp0_, &_tmp1_, NULL, &_inner_error_);
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_g_free0 (contents);
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		contents = _tmp1_;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2790 "page.c"
 			goto __catch3_g_error;
@@ -2796,65 +2796,65 @@ static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_fi
 		GError* e = NULL;
 		GError* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-#line 631 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		e = _inner_error_;
-#line 631 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_inner_error_ = NULL;
-#line 637 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = e;
-#line 637 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = _tmp2_->message;
-#line 637 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_warning ("page.vala:637: failed to get icc profile data: %s", _tmp3_);
-#line 638 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		result = NULL;
-#line 638 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_g_error_free0 (e);
-#line 638 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_g_free0 (contents);
-#line 638 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
 #line 2818 "page.c"
 	}
 	__finally3:
-#line 631 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 631 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_g_free0 (contents);
-#line 631 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.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 631 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_clear_error (&_inner_error_);
-#line 631 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return NULL;
 #line 2831 "page.c"
 	}
-#line 642 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = contents;
-#line 642 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp6_ = string_to_utf8 (_tmp4_, &_tmp5_);
-#line 642 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = (guchar*) _tmp6_;
-#line 642 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7__length1 = (_tmp5_ * sizeof (gchar)) / sizeof (guchar);
-#line 642 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = g_base64_encode (_tmp7_, (_tmp5_ * sizeof (gchar)) / sizeof (guchar));
-#line 642 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp9_ = _tmp8_;
-#line 642 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = (g_free (_tmp7_), NULL);
-#line 642 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp9_;
-#line 642 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (contents);
-#line 642 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 2853 "page.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return self ? g_object_ref (self) : NULL;
 #line 2860 "page.c"
 }
@@ -2870,35 +2870,35 @@ void page_copy_to_clipboard (Page* self, GtkWindow* window) {
 	GtkClipboard* _tmp4_ = NULL;
 	GdkPixbuf* image = NULL;
 	GdkPixbuf* _tmp5_ = NULL;
-#line 645 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 645 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (window != NULL);
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = window;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = gtk_widget_get_display ((GtkWidget*) _tmp0_);
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	display = _tmp2_;
-#line 648 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD);
-#line 648 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 648 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 648 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	clipboard = _tmp4_;
-#line 649 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp5_ = page_get_image (self, TRUE);
-#line 649 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	image = _tmp5_;
-#line 650 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	gtk_clipboard_set_image (clipboard, image);
-#line 645 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (image);
-#line 645 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (clipboard);
-#line 645 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (display);
 #line 2904 "page.c"
 }
@@ -2919,62 +2919,62 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 	const gchar* _tmp9_ = NULL;
 	gint _tmp10_ = 0;
 	GError * _inner_error_ = NULL;
-#line 653 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 653 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (type != NULL);
-#line 653 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (file != NULL);
-#line 655 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = file;
-#line 655 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = g_file_replace (_tmp0_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_);
-#line 655 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	stream = _tmp1_;
-#line 655 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 655 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_propagate_error (error, _inner_error_);
-#line 655 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
 #line 2941 "page.c"
 	}
-#line 656 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = stream;
-#line 656 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = pixbuf_writer_new (_tmp2_);
-#line 656 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	writer = _tmp3_;
-#line 657 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = page_get_image (self, TRUE);
-#line 657 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	image = _tmp4_;
-#line 659 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	icc_profile_data = NULL;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp5_ = self->priv->_color_profile;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp5_ != NULL) {
 #line 2959 "page.c"
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 661 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = self->priv->_color_profile;
-#line 661 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp7_ = page_get_icc_data_encoded (self, _tmp6_);
-#line 661 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_g_free0 (icc_profile_data);
-#line 661 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		icc_profile_data = _tmp7_;
 #line 2970 "page.c"
 	}
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = g_strcmp0;
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp9_ = type;
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp10_ = _tmp8_ (_tmp9_, "jpeg");
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp10_ == 0) {
 #line 2980 "page.c"
 		gchar** keys = NULL;
@@ -3004,136 +3004,136 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 		gint _tmp30__length1 = 0;
 		gchar** _tmp31_ = NULL;
 		gint _tmp31__length1 = 0;
-#line 665 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp11_ = g_strdup ("x-dpi");
-#line 665 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp12_ = g_strdup ("y-dpi");
-#line 665 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp13_ = g_strdup ("quality");
-#line 665 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp14_ = g_strdup ("icc-profile");
-#line 665 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp15_ = g_new0 (gchar*, 5 + 1);
-#line 665 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp15_[0] = _tmp11_;
-#line 665 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp15_[1] = _tmp12_;
-#line 665 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp15_[2] = _tmp13_;
-#line 665 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp15_[3] = _tmp14_;
-#line 665 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp15_[4] = NULL;
-#line 665 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		keys = _tmp15_;
-#line 665 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		keys_length1 = 5;
-#line 665 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 665 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_keys_size_ = keys_length1;
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp16_ = self->priv->_dpi;
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp17_ = g_strdup_printf ("%d", _tmp16_);
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp18_ = self->priv->_dpi;
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp19_ = g_strdup_printf ("%d", _tmp18_);
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp20_ = quality;
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp21_ = g_strdup_printf ("%d", _tmp20_);
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp22_ = icc_profile_data;
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp23_ = g_strdup (_tmp22_);
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp24_ = g_new0 (gchar*, 5 + 1);
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp24_[0] = _tmp17_;
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp24_[1] = _tmp19_;
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp24_[2] = _tmp21_;
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp24_[3] = _tmp23_;
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp24_[4] = NULL;
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		values = _tmp24_;
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		values_length1 = 5;
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_values_size_ = values_length1;
-#line 667 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp25_ = icc_profile_data;
-#line 667 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp25_ == NULL) {
 #line 3072 "page.c"
 			gchar** _tmp26_ = NULL;
 			gint _tmp26__length1 = 0;
 			gchar* _tmp27_ = NULL;
-#line 668 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp26_ = keys;
-#line 668 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp26__length1 = keys_length1;
-#line 668 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_g_free0 (_tmp26_[3]);
-#line 668 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp26_[3] = NULL;
-#line 668 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp27_ = _tmp26_[3];
 #line 3086 "page.c"
 		}
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp28_ = writer;
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp29_ = image;
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp30_ = keys;
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp30__length1 = keys_length1;
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp31_ = values;
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp31__length1 = values_length1;
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_save (_tmp28_, _tmp29_, "jpeg", _tmp30_, _tmp30__length1, _tmp31_, _tmp31__length1, &_inner_error_);
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			g_propagate_error (error, _inner_error_);
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_g_free0 (icc_profile_data);
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_g_object_unref0 (image);
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_pixbuf_writer_unref0 (writer);
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_g_object_unref0 (stream);
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return;
 #line 3120 "page.c"
 		}
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
 #line 3126 "page.c"
 	} else {
 		GCompareFunc _tmp32_ = NULL;
 		const gchar* _tmp33_ = NULL;
 		gint _tmp34_ = 0;
-#line 671 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp32_ = g_strcmp0;
-#line 671 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp33_ = type;
-#line 671 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp34_ = _tmp32_ (_tmp33_, "png");
-#line 671 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp34_ == 0) {
 #line 3139 "page.c"
 			gchar** keys = NULL;
@@ -3160,126 +3160,126 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 			gint _tmp51__length1 = 0;
 			gchar** _tmp52_ = NULL;
 			gint _tmp52__length1 = 0;
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp35_ = g_strdup ("x-dpi");
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp36_ = g_strdup ("y-dpi");
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp37_ = g_strdup ("icc-profile");
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp38_ = g_new0 (gchar*, 4 + 1);
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp38_[0] = _tmp35_;
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp38_[1] = _tmp36_;
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp38_[2] = _tmp37_;
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp38_[3] = NULL;
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			keys = _tmp38_;
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			keys_length1 = 4;
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_keys_size_ = keys_length1;
-#line 674 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp39_ = self->priv->_dpi;
-#line 674 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp40_ = g_strdup_printf ("%d", _tmp39_);
-#line 674 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp41_ = self->priv->_dpi;
-#line 674 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp42_ = g_strdup_printf ("%d", _tmp41_);
-#line 674 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp43_ = icc_profile_data;
-#line 674 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp44_ = g_strdup (_tmp43_);
-#line 674 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp45_ = g_new0 (gchar*, 4 + 1);
-#line 674 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp45_[0] = _tmp40_;
-#line 674 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp45_[1] = _tmp42_;
-#line 674 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp45_[2] = _tmp44_;
-#line 674 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp45_[3] = NULL;
-#line 674 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			values = _tmp45_;
-#line 674 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			values_length1 = 4;
-#line 674 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 674 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_values_size_ = values_length1;
-#line 675 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp46_ = icc_profile_data;
-#line 675 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			if (_tmp46_ == NULL) {
 #line 3218 "page.c"
 				gchar** _tmp47_ = NULL;
 				gint _tmp47__length1 = 0;
 				gchar* _tmp48_ = NULL;
-#line 676 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp47_ = keys;
-#line 676 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp47__length1 = keys_length1;
-#line 676 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_g_free0 (_tmp47_[2]);
-#line 676 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp47_[2] = NULL;
-#line 676 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp48_ = _tmp47_[2];
 #line 3232 "page.c"
 			}
-#line 677 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp49_ = writer;
-#line 677 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp50_ = image;
-#line 677 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp51_ = keys;
-#line 677 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp51__length1 = keys_length1;
-#line 677 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp52_ = values;
-#line 677 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp52__length1 = values_length1;
-#line 677 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			pixbuf_writer_save (_tmp49_, _tmp50_, "png", _tmp51_, _tmp51__length1, _tmp52_, _tmp52__length1, &_inner_error_);
-#line 677 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 677 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				g_propagate_error (error, _inner_error_);
-#line 677 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 677 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 677 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_g_free0 (icc_profile_data);
-#line 677 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_g_object_unref0 (image);
-#line 677 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_pixbuf_writer_unref0 (writer);
-#line 677 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_g_object_unref0 (stream);
-#line 677 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				return;
 #line 3266 "page.c"
 			}
-#line 671 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 671 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
 #line 3272 "page.c"
 		} else {
 			GCompareFunc _tmp53_ = NULL;
 			const gchar* _tmp54_ = NULL;
 			gint _tmp55_ = 0;
-#line 679 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp53_ = g_strcmp0;
-#line 679 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp54_ = type;
-#line 679 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp55_ = _tmp53_ (_tmp54_, "tiff");
-#line 679 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			if (_tmp55_ == 0) {
 #line 3285 "page.c"
 				gchar** keys = NULL;
@@ -3308,134 +3308,134 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 				gint _tmp74__length1 = 0;
 				gchar** _tmp75_ = NULL;
 				gint _tmp75__length1 = 0;
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp56_ = g_strdup ("x-dpi");
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp57_ = g_strdup ("y-dpi");
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp58_ = g_strdup ("compression");
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp59_ = g_strdup ("icc-profile");
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp60_ = g_new0 (gchar*, 5 + 1);
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp60_[0] = _tmp56_;
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp60_[1] = _tmp57_;
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp60_[2] = _tmp58_;
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp60_[3] = _tmp59_;
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp60_[4] = NULL;
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				keys = _tmp60_;
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				keys_length1 = 5;
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_keys_size_ = keys_length1;
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp61_ = self->priv->_dpi;
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp62_ = g_strdup_printf ("%d", _tmp61_);
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp63_ = self->priv->_dpi;
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp64_ = g_strdup_printf ("%d", _tmp63_);
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp65_ = g_strdup ("8");
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp66_ = icc_profile_data;
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp67_ = g_strdup (_tmp66_);
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp68_ = g_new0 (gchar*, 5 + 1);
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp68_[0] = _tmp62_;
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp68_[1] = _tmp64_;
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp68_[2] = _tmp65_;
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp68_[3] = _tmp67_;
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp68_[4] = NULL;
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				values = _tmp68_;
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				values_length1 = 5;
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_values_size_ = values_length1;
-#line 683 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp69_ = icc_profile_data;
-#line 683 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (_tmp69_ == NULL) {
 #line 3374 "page.c"
 					gchar** _tmp70_ = NULL;
 					gint _tmp70__length1 = 0;
 					gchar* _tmp71_ = NULL;
-#line 684 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp70_ = keys;
-#line 684 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp70__length1 = keys_length1;
-#line 684 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_g_free0 (_tmp70_[3]);
-#line 684 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp70_[3] = NULL;
-#line 684 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp71_ = _tmp70_[3];
 #line 3388 "page.c"
 				}
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp72_ = writer;
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp73_ = image;
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp74_ = keys;
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp74__length1 = keys_length1;
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp75_ = values;
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp75__length1 = values_length1;
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				pixbuf_writer_save (_tmp72_, _tmp73_, "tiff", _tmp74_, _tmp74__length1, _tmp75_, _tmp75__length1, &_inner_error_);
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					g_propagate_error (error, _inner_error_);
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_g_free0 (icc_profile_data);
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_g_object_unref0 (image);
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_pixbuf_writer_unref0 (writer);
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_g_object_unref0 (stream);
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					return;
 #line 3422 "page.c"
 				}
-#line 679 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 679 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
 #line 3428 "page.c"
 			} else {
 			}
 		}
 	}
-#line 653 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (icc_profile_data);
-#line 653 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (image);
-#line 653 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_pixbuf_writer_unref0 (writer);
-#line 653 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (stream);
 #line 3441 "page.c"
 }
@@ -3446,46 +3446,46 @@ gint page_get_width (Page* self) {
 	gboolean _tmp0_ = FALSE;
 	ScanDirection _tmp1_ = 0;
 	ScanDirection _tmp2_ = 0;
-#line 25 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 25 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 27 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = page_get_scan_direction (self);
-#line 27 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = _tmp1_;
-#line 27 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp2_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
-#line 27 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = TRUE;
 #line 3460 "page.c"
 	} else {
 		ScanDirection _tmp3_ = 0;
 		ScanDirection _tmp4_ = 0;
-#line 27 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = page_get_scan_direction (self);
-#line 27 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = _tmp3_;
-#line 27 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp4_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
 #line 3470 "page.c"
 	}
-#line 27 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp0_) {
 #line 3474 "page.c"
 		gint _tmp5_ = 0;
-#line 28 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = self->priv->_scan_width;
-#line 28 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		result = _tmp5_;
-#line 28 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
 #line 3482 "page.c"
 	} else {
 		gint _tmp6_ = 0;
-#line 30 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = self->priv->_scan_height;
-#line 30 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		result = _tmp6_;
-#line 30 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
 #line 3491 "page.c"
 	}
@@ -3497,46 +3497,46 @@ gint page_get_height (Page* self) {
 	gboolean _tmp0_ = FALSE;
 	ScanDirection _tmp1_ = 0;
 	ScanDirection _tmp2_ = 0;
-#line 37 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 37 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = page_get_scan_direction (self);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = _tmp1_;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp2_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = TRUE;
 #line 3511 "page.c"
 	} else {
 		ScanDirection _tmp3_ = 0;
 		ScanDirection _tmp4_ = 0;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = page_get_scan_direction (self);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = _tmp3_;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp4_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
 #line 3521 "page.c"
 	}
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp0_) {
 #line 3525 "page.c"
 		gint _tmp5_ = 0;
-#line 40 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = self->priv->_scan_height;
-#line 40 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		result = _tmp5_;
-#line 40 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
 #line 3533 "page.c"
 	} else {
 		gint _tmp6_ = 0;
-#line 42 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = self->priv->_scan_width;
-#line 42 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		result = _tmp6_;
-#line 42 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
 #line 3542 "page.c"
 	}
@@ -3549,19 +3549,19 @@ gboolean page_get_is_landscape (Page* self) {
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
-#line 47 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 47 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = page_get_width (self);
-#line 47 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _tmp0_;
-#line 47 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = page_get_height (self);
-#line 47 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = _tmp2_;
-#line 47 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp1_ > _tmp3_;
-#line 47 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 3567 "page.c"
 }
@@ -3570,13 +3570,13 @@ gboolean page_get_is_landscape (Page* self) {
 gint page_get_dpi (Page* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 50 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 50 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_dpi;
-#line 50 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
-#line 50 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 3582 "page.c"
 }
@@ -3584,11 +3584,11 @@ gint page_get_dpi (Page* self) {
 
 static void page_set_dpi (Page* self, gint value) {
 	gint _tmp0_ = 0;
-#line 50 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 50 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = value;
-#line 50 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_dpi = _tmp0_;
 #line 3594 "page.c"
 }
@@ -3597,13 +3597,13 @@ static void page_set_dpi (Page* self, gint value) {
 gint page_get_depth (Page* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 56 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 56 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_depth;
-#line 56 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
-#line 56 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 3609 "page.c"
 }
@@ -3611,11 +3611,11 @@ gint page_get_depth (Page* self) {
 
 static void page_set_depth (Page* self, gint value) {
 	gint _tmp0_ = 0;
-#line 56 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 56 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = value;
-#line 56 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_depth = _tmp0_;
 #line 3621 "page.c"
 }
@@ -3624,13 +3624,13 @@ static void page_set_depth (Page* self, gint value) {
 const gchar* page_get_color_profile (Page* self) {
 	const gchar* result;
 	const gchar* _tmp0_ = NULL;
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_color_profile;
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 3636 "page.c"
 }
@@ -3639,15 +3639,15 @@ const gchar* page_get_color_profile (Page* self) {
 void page_set_color_profile (Page* self, const gchar* value) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = value;
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (self->priv->_color_profile);
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_color_profile = _tmp1_;
 #line 3653 "page.c"
 }
@@ -3656,13 +3656,13 @@ void page_set_color_profile (Page* self, const gchar* value) {
 gint page_get_scan_width (Page* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 62 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 62 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_scan_width;
-#line 62 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
-#line 62 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 3668 "page.c"
 }
@@ -3670,11 +3670,11 @@ gint page_get_scan_width (Page* self) {
 
 static void page_set_scan_width (Page* self, gint value) {
 	gint _tmp0_ = 0;
-#line 62 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 62 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = value;
-#line 62 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_scan_width = _tmp0_;
 #line 3680 "page.c"
 }
@@ -3683,13 +3683,13 @@ static void page_set_scan_width (Page* self, gint value) {
 gint page_get_scan_height (Page* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_scan_height;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 3695 "page.c"
 }
@@ -3697,11 +3697,11 @@ gint page_get_scan_height (Page* self) {
 
 static void page_set_scan_height (Page* self, gint value) {
 	gint _tmp0_ = 0;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = value;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_scan_height = _tmp0_;
 #line 3707 "page.c"
 }
@@ -3710,13 +3710,13 @@ static void page_set_scan_height (Page* self, gint value) {
 gint page_get_rowstride (Page* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 68 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 68 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_rowstride;
-#line 68 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
-#line 68 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 3722 "page.c"
 }
@@ -3724,11 +3724,11 @@ gint page_get_rowstride (Page* self) {
 
 static void page_set_rowstride (Page* self, gint value) {
 	gint _tmp0_ = 0;
-#line 68 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 68 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = value;
-#line 68 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_rowstride = _tmp0_;
 #line 3734 "page.c"
 }
@@ -3737,13 +3737,13 @@ static void page_set_rowstride (Page* self, gint value) {
 gint page_get_n_channels (Page* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 71 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 71 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_n_channels;
-#line 71 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
-#line 71 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 3749 "page.c"
 }
@@ -3751,11 +3751,11 @@ gint page_get_n_channels (Page* self) {
 
 static void page_set_n_channels (Page* self, gint value) {
 	gint _tmp0_ = 0;
-#line 71 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 71 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = value;
-#line 71 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_n_channels = _tmp0_;
 #line 3761 "page.c"
 }
@@ -3764,13 +3764,13 @@ static void page_set_n_channels (Page* self, gint value) {
 gboolean page_get_is_scanning (Page* self) {
 	gboolean result;
 	gboolean _tmp0_ = FALSE;
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_is_scanning;
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 3776 "page.c"
 }
@@ -3778,11 +3778,11 @@ gboolean page_get_is_scanning (Page* self) {
 
 static void page_set_is_scanning (Page* self, gboolean value) {
 	gboolean _tmp0_ = FALSE;
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = value;
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_is_scanning = _tmp0_;
 #line 3788 "page.c"
 }
@@ -3791,13 +3791,13 @@ static void page_set_is_scanning (Page* self, gboolean value) {
 gboolean page_get_has_data (Page* self) {
 	gboolean result;
 	gboolean _tmp0_ = FALSE;
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_has_data;
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 3803 "page.c"
 }
@@ -3805,11 +3805,11 @@ gboolean page_get_has_data (Page* self) {
 
 static void page_set_has_data (Page* self, gboolean value) {
 	gboolean _tmp0_ = FALSE;
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = value;
-#line 80 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_has_data = _tmp0_;
 #line 3815 "page.c"
 }
@@ -3818,13 +3818,13 @@ static void page_set_has_data (Page* self, gboolean value) {
 gint page_get_scan_line (Page* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 83 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 83 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_scan_line;
-#line 83 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
-#line 83 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 3830 "page.c"
 }
@@ -3832,11 +3832,11 @@ gint page_get_scan_line (Page* self) {
 
 static void page_set_scan_line (Page* self, gint value) {
 	gint _tmp0_ = 0;
-#line 83 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 83 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = value;
-#line 83 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_scan_line = _tmp0_;
 #line 3842 "page.c"
 }
@@ -3845,13 +3845,13 @@ static void page_set_scan_line (Page* self, gint value) {
 gboolean page_get_is_color (Page* self) {
 	gboolean result;
 	gint _tmp0_ = 0;
-#line 86 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 86 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_n_channels;
-#line 86 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_ > 1;
-#line 86 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 3857 "page.c"
 }
@@ -3860,13 +3860,13 @@ gboolean page_get_is_color (Page* self) {
 ScanDirection page_get_scan_direction (Page* self) {
 	ScanDirection result;
 	ScanDirection _tmp0_ = 0;
-#line 92 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 92 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->scan_direction_;
-#line 92 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
-#line 92 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 3872 "page.c"
 }
@@ -3885,57 +3885,57 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 	ScanDirection _tmp35_ = 0;
 	gboolean _tmp36_ = FALSE;
 	gboolean _tmp37_ = FALSE;
-#line 94 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 96 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->scan_direction_;
-#line 96 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = value;
-#line 96 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 97 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
 #line 3899 "page.c"
 	}
-#line 100 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	size_has_changed = FALSE;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = value;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = self->priv->scan_direction_;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	left_steps = (gint) (_tmp2_ - _tmp3_);
-#line 102 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = left_steps;
-#line 102 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp4_ < 0) {
 #line 3913 "page.c"
 		gint _tmp5_ = 0;
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = left_steps;
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		left_steps = _tmp5_ + 4;
 #line 3919 "page.c"
 	}
-#line 104 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp6_ = left_steps;
-#line 104 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp6_ != 2) {
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		size_has_changed = TRUE;
 #line 3927 "page.c"
 	}
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = self->priv->_has_crop;
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp7_) {
 #line 3933 "page.c"
 		gint _tmp8_ = 0;
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp8_ = left_steps;
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (_tmp8_) {
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			case 1:
 #line 3941 "page.c"
 			{
@@ -3949,41 +3949,41 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 				gint _tmp15_ = 0;
 				gint _tmp16_ = 0;
 				gint _tmp17_ = 0;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp9_ = self->priv->_crop_x;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				t = _tmp9_;
-#line 115 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp10_ = self->priv->_crop_y;
-#line 115 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				page_set_crop_x (self, _tmp10_);
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp11_ = page_get_width (self);
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp12_ = _tmp11_;
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp13_ = t;
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp14_ = self->priv->_crop_width;
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				page_set_crop_y (self, _tmp12_ - (_tmp13_ + _tmp14_));
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp15_ = self->priv->_crop_width;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				t = _tmp15_;
-#line 118 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp16_ = self->priv->_crop_height;
-#line 118 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				page_set_crop_width (self, _tmp16_);
-#line 119 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp17_ = t;
-#line 119 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				page_set_crop_height (self, _tmp17_);
-#line 120 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
 #line 3985 "page.c"
 			}
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			case 2:
 #line 3989 "page.c"
 			{
@@ -3995,31 +3995,31 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 				gint _tmp23_ = 0;
 				gint _tmp24_ = 0;
 				gint _tmp25_ = 0;
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp18_ = page_get_width (self);
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp19_ = _tmp18_;
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp20_ = self->priv->_crop_x;
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp21_ = self->priv->_crop_width;
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				page_set_crop_x (self, _tmp19_ - (_tmp20_ + _tmp21_));
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp22_ = page_get_width (self);
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp23_ = _tmp22_;
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp24_ = self->priv->_crop_y;
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp25_ = self->priv->_crop_height;
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				page_set_crop_y (self, _tmp23_ - (_tmp24_ + _tmp25_));
-#line 125 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
 #line 4021 "page.c"
 			}
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			case 3:
 #line 4025 "page.c"
 			{
@@ -4033,65 +4033,65 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 				gint _tmp32_ = 0;
 				gint _tmp33_ = 0;
 				gint _tmp34_ = 0;
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp26_ = self->priv->_crop_y;
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				t = _tmp26_;
-#line 129 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp27_ = self->priv->_crop_x;
-#line 129 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 129 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				page_set_crop_y (self, _tmp27_);
-#line 130 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp28_ = page_get_height (self);
-#line 130 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp29_ = _tmp28_;
-#line 130 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp30_ = t;
-#line 130 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp31_ = self->priv->_crop_height;
-#line 130 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				page_set_crop_x (self, _tmp29_ - (_tmp30_ + _tmp31_));
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp32_ = self->priv->_crop_width;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				t = _tmp32_;
-#line 132 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp33_ = self->priv->_crop_height;
-#line 132 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				page_set_crop_width (self, _tmp33_);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp34_ = t;
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				page_set_crop_height (self, _tmp34_);
-#line 134 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
 #line 4069 "page.c"
 			}
 			default:
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
 #line 4074 "page.c"
 		}
 	}
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp35_ = value;
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->scan_direction_ = _tmp35_;
-#line 139 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp36_ = size_has_changed;
-#line 139 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp36_) {
-#line 140 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_signal_emit_by_name (self, "size-changed");
 #line 4087 "page.c"
 	}
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-direction-changed");
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp37_ = self->priv->_has_crop;
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp37_) {
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_signal_emit_by_name (self, "crop-changed");
 #line 4097 "page.c"
 	}
@@ -4101,13 +4101,13 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 gboolean page_get_has_crop (Page* self) {
 	gboolean result;
 	gboolean _tmp0_ = FALSE;
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_has_crop;
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 4113 "page.c"
 }
@@ -4115,11 +4115,11 @@ gboolean page_get_has_crop (Page* self) {
 
 static void page_set_has_crop (Page* self, gboolean value) {
 	gboolean _tmp0_ = FALSE;
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = value;
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_has_crop = _tmp0_;
 #line 4125 "page.c"
 }
@@ -4128,13 +4128,13 @@ static void page_set_has_crop (Page* self, gboolean value) {
 const gchar* page_get_crop_name (Page* self) {
 	const gchar* result;
 	const gchar* _tmp0_ = NULL;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_crop_name;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 4140 "page.c"
 }
@@ -4143,15 +4143,15 @@ const gchar* page_get_crop_name (Page* self) {
 static void page_set_crop_name (Page* self, const gchar* value) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = value;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (self->priv->_crop_name);
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_crop_name = _tmp1_;
 #line 4157 "page.c"
 }
@@ -4160,13 +4160,13 @@ static void page_set_crop_name (Page* self, const gchar* value) {
 gint page_get_crop_x (Page* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_crop_x;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 4172 "page.c"
 }
@@ -4174,11 +4174,11 @@ gint page_get_crop_x (Page* self) {
 
 static void page_set_crop_x (Page* self, gint value) {
 	gint _tmp0_ = 0;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = value;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_crop_x = _tmp0_;
 #line 4184 "page.c"
 }
@@ -4187,13 +4187,13 @@ static void page_set_crop_x (Page* self, gint value) {
 gint page_get_crop_y (Page* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_crop_y;
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 4199 "page.c"
 }
@@ -4201,11 +4201,11 @@ gint page_get_crop_y (Page* self) {
 
 static void page_set_crop_y (Page* self, gint value) {
 	gint _tmp0_ = 0;
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = value;
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_crop_y = _tmp0_;
 #line 4211 "page.c"
 }
@@ -4214,13 +4214,13 @@ static void page_set_crop_y (Page* self, gint value) {
 gint page_get_crop_width (Page* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_crop_width;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 4226 "page.c"
 }
@@ -4228,11 +4228,11 @@ gint page_get_crop_width (Page* self) {
 
 static void page_set_crop_width (Page* self, gint value) {
 	gint _tmp0_ = 0;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = value;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_crop_width = _tmp0_;
 #line 4238 "page.c"
 }
@@ -4241,13 +4241,13 @@ static void page_set_crop_width (Page* self, gint value) {
 gint page_get_crop_height (Page* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->priv->_crop_height;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp0_;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 4253 "page.c"
 }
@@ -4255,27 +4255,27 @@ gint page_get_crop_height (Page* self) {
 
 static void page_set_crop_height (Page* self, gint value) {
 	gint _tmp0_ = 0;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = value;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_crop_height = _tmp0_;
 #line 4265 "page.c"
 }
 
 
 static void value_page_init (GValue* value) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	value->data[0].v_pointer = NULL;
 #line 4272 "page.c"
 }
 
 
 static void value_page_free_value (GValue* value) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (value->data[0].v_pointer) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_unref (value->data[0].v_pointer);
 #line 4281 "page.c"
 	}
@@ -4283,13 +4283,13 @@ static void value_page_free_value (GValue* value) {
 
 
 static void value_page_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (src_value->data[0].v_pointer) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = page_ref (src_value->data[0].v_pointer);
 #line 4291 "page.c"
 	} else {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 4295 "page.c"
 	}
@@ -4297,37 +4297,37 @@ static void value_page_copy_value (const GValue* src_value, GValue* dest_value)
 
 
 static gpointer value_page_peek_pointer (const GValue* value) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
 #line 4303 "page.c"
 }
 
 
 static gchar* value_page_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (collect_values[0].v_pointer) {
 #line 4310 "page.c"
 		Page* object;
 		object = collect_values[0].v_pointer;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 4317 "page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 4321 "page.c"
 		}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = page_ref (object);
 #line 4325 "page.c"
 	} else {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
 #line 4329 "page.c"
 	}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
 #line 4333 "page.c"
 }
@@ -4336,27 +4336,27 @@ static gchar* value_page_collect_value (GValue* value, guint n_collect_values, G
 static gchar* value_page_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	Page** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!object_p) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 4344 "page.c"
 	}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!value->data[0].v_pointer) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = NULL;
 #line 4350 "page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = value->data[0].v_pointer;
 #line 4354 "page.c"
 	} else {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = page_ref (value->data[0].v_pointer);
 #line 4358 "page.c"
 	}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
 #line 4362 "page.c"
 }
@@ -4364,22 +4364,22 @@ static gchar* value_page_lcopy_value (const GValue* value, guint n_collect_value
 
 GParamSpec* param_spec_page (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPage* spec;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PAGE), NULL);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return G_PARAM_SPEC (spec);
 #line 4376 "page.c"
 }
 
 
 gpointer value_get_page (const GValue* value) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE), NULL);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
 #line 4385 "page.c"
 }
@@ -4387,29 +4387,29 @@ gpointer value_get_page (const GValue* value) {
 
 void value_set_page (GValue* value, gpointer v_object) {
 	Page* old;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	old = value->data[0].v_pointer;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (v_object) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PAGE));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = v_object;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_ref (value->data[0].v_pointer);
 #line 4405 "page.c"
 	} else {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
 #line 4409 "page.c"
 	}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_unref (old);
 #line 4415 "page.c"
 	}
@@ -4418,27 +4418,27 @@ void value_set_page (GValue* value, gpointer v_object) {
 
 void value_take_page (GValue* value, gpointer v_object) {
 	Page* old;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	old = value->data[0].v_pointer;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (v_object) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PAGE));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = v_object;
 #line 4434 "page.c"
 	} else {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
 #line 4438 "page.c"
 	}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_unref (old);
 #line 4444 "page.c"
 	}
@@ -4446,32 +4446,32 @@ void value_take_page (GValue* value, gpointer v_object) {
 
 
 static void page_class_init (PageClass * klass) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_parent_class = g_type_class_peek_parent (klass);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	((PageClass *) klass)->finalize = page_finalize;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_type_class_add_private (klass, sizeof (PagePrivate));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_new ("pixels_changed", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_new ("size_changed", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_new ("scan_line_changed", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_new ("scan_direction_changed", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_new ("crop_changed", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_new ("scan_finished", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 4468 "page.c"
 }
 
 
 static void page_instance_init (Page * self) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv = PAGE_GET_PRIVATE (self);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->ref_count = 1;
 #line 4477 "page.c"
 }
@@ -4479,15 +4479,15 @@ static void page_instance_init (Page * self) {
 
 static void page_finalize (Page* obj) {
 	Page * self;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE, Page);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_handlers_destroy (self);
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (self->priv->_color_profile);
-#line 74 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->pixels = (g_free (self->priv->pixels), NULL);
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (self->priv->_crop_name);
 #line 4493 "page.c"
 }
@@ -4510,9 +4510,9 @@ GType page_get_type (void) {
 gpointer page_ref (gpointer instance) {
 	Page* self;
 	self = instance;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return instance;
 #line 4518 "page.c"
 }
@@ -4521,11 +4521,11 @@ gpointer page_ref (gpointer instance) {
 void page_unref (gpointer instance) {
 	Page* self;
 	self = instance;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		PAGE_GET_CLASS (self)->finalize (self);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 4531 "page.c"
 	}
@@ -4536,26 +4536,26 @@ PixbufWriter* pixbuf_writer_construct (GType object_type, GFileOutputStream* str
 	PixbufWriter* self = NULL;
 	GFileOutputStream* _tmp0_ = NULL;
 	GFileOutputStream* _tmp1_ = NULL;
-#line 696 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (stream != NULL, NULL);
-#line 696 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self = (PixbufWriter*) g_type_create_instance (object_type);
-#line 698 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = stream;
-#line 698 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 698 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (self->stream);
-#line 698 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->stream = _tmp1_;
-#line 696 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return self;
 #line 4554 "page.c"
 }
 
 
 PixbufWriter* pixbuf_writer_new (GFileOutputStream* stream) {
-#line 696 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return pixbuf_writer_construct (TYPE_PIXBUF_WRITER, stream);
 #line 4561 "page.c"
 }
@@ -4564,7 +4564,7 @@ PixbufWriter* pixbuf_writer_new (GFileOutputStream* stream) {
 static gboolean _pixbuf_writer_write_pixbuf_data_gdk_pixbuf_save_func (guint8* buf, gsize buf_length1, GError** error, gpointer self) {
 	gboolean result;
 	result = pixbuf_writer_write_pixbuf_data ((PixbufWriter*) self, buf, buf_length1, error);
-#line 703 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 4570 "page.c"
 }
@@ -4578,31 +4578,31 @@ void pixbuf_writer_save (PixbufWriter* self, GdkPixbuf* image, const gchar* type
 	gchar** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 701 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
-#line 701 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (image != NULL);
-#line 701 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (type != NULL);
-#line 703 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = image;
-#line 703 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = type;
-#line 703 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = option_keys;
-#line 703 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2__length1 = option_keys_length1;
-#line 703 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3_ = option_values;
-#line 703 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp3__length1 = option_values_length1;
-#line 703 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	gdk_pixbuf_save_to_callbackv (_tmp0_, _pixbuf_writer_write_pixbuf_data_gdk_pixbuf_save_func, self, _tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 703 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 703 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_propagate_error (error, _inner_error_);
-#line 703 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
 #line 4608 "page.c"
 	}
@@ -4615,43 +4615,43 @@ static gboolean pixbuf_writer_write_pixbuf_data (PixbufWriter* self, guint8* buf
 	guint8* _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 706 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 708 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp0_ = self->stream;
-#line 708 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = buf;
-#line 708 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1__length1 = buf_length1;
-#line 708 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_output_stream_write_all ((GOutputStream*) _tmp0_, _tmp1_, (gsize) _tmp1__length1, NULL, NULL, &_inner_error_);
-#line 708 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 708 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_propagate_error (error, _inner_error_);
-#line 708 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return FALSE;
 #line 4635 "page.c"
 	}
-#line 709 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = TRUE;
-#line 709 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
 #line 4641 "page.c"
 }
 
 
 static void value_pixbuf_writer_init (GValue* value) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	value->data[0].v_pointer = NULL;
 #line 4648 "page.c"
 }
 
 
 static void value_pixbuf_writer_free_value (GValue* value) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (value->data[0].v_pointer) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (value->data[0].v_pointer);
 #line 4657 "page.c"
 	}
@@ -4659,13 +4659,13 @@ static void value_pixbuf_writer_free_value (GValue* value) {
 
 
 static void value_pixbuf_writer_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (src_value->data[0].v_pointer) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = pixbuf_writer_ref (src_value->data[0].v_pointer);
 #line 4667 "page.c"
 	} else {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 4671 "page.c"
 	}
@@ -4673,37 +4673,37 @@ static void value_pixbuf_writer_copy_value (const GValue* src_value, GValue* des
 
 
 static gpointer value_pixbuf_writer_peek_pointer (const GValue* value) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
 #line 4679 "page.c"
 }
 
 
 static gchar* value_pixbuf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (collect_values[0].v_pointer) {
 #line 4686 "page.c"
 		PixbufWriter* object;
 		object = collect_values[0].v_pointer;
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 4693 "page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 4697 "page.c"
 		}
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = pixbuf_writer_ref (object);
 #line 4701 "page.c"
 	} else {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
 #line 4705 "page.c"
 	}
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
 #line 4709 "page.c"
 }
@@ -4712,27 +4712,27 @@ static gchar* value_pixbuf_writer_collect_value (GValue* value, guint n_collect_
 static gchar* value_pixbuf_writer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PixbufWriter** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!object_p) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 4720 "page.c"
 	}
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!value->data[0].v_pointer) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = NULL;
 #line 4726 "page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = value->data[0].v_pointer;
 #line 4730 "page.c"
 	} else {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = pixbuf_writer_ref (value->data[0].v_pointer);
 #line 4734 "page.c"
 	}
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
 #line 4738 "page.c"
 }
@@ -4740,22 +4740,22 @@ static gchar* value_pixbuf_writer_lcopy_value (const GValue* value, guint n_coll
 
 GParamSpec* param_spec_pixbuf_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPixbufWriter* spec;
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PIXBUF_WRITER), NULL);
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return G_PARAM_SPEC (spec);
 #line 4752 "page.c"
 }
 
 
 gpointer value_get_pixbuf_writer (const GValue* value) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXBUF_WRITER), NULL);
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
 #line 4761 "page.c"
 }
@@ -4763,29 +4763,29 @@ gpointer value_get_pixbuf_writer (const GValue* value) {
 
 void value_set_pixbuf_writer (GValue* value, gpointer v_object) {
 	PixbufWriter* old;
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXBUF_WRITER));
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	old = value->data[0].v_pointer;
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (v_object) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXBUF_WRITER));
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = v_object;
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_ref (value->data[0].v_pointer);
 #line 4781 "page.c"
 	} else {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
 #line 4785 "page.c"
 	}
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (old);
 #line 4791 "page.c"
 	}
@@ -4794,27 +4794,27 @@ void value_set_pixbuf_writer (GValue* value, gpointer v_object) {
 
 void value_take_pixbuf_writer (GValue* value, gpointer v_object) {
 	PixbufWriter* old;
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXBUF_WRITER));
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	old = value->data[0].v_pointer;
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (v_object) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXBUF_WRITER));
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = v_object;
 #line 4810 "page.c"
 	} else {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
 #line 4814 "page.c"
 	}
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (old);
 #line 4820 "page.c"
 	}
@@ -4822,16 +4822,16 @@ void value_take_pixbuf_writer (GValue* value, gpointer v_object) {
 
 
 static void pixbuf_writer_class_init (PixbufWriterClass * klass) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	pixbuf_writer_parent_class = g_type_class_peek_parent (klass);
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	((PixbufWriterClass *) klass)->finalize = pixbuf_writer_finalize;
 #line 4830 "page.c"
 }
 
 
 static void pixbuf_writer_instance_init (PixbufWriter * self) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->ref_count = 1;
 #line 4837 "page.c"
 }
@@ -4839,11 +4839,11 @@ static void pixbuf_writer_instance_init (PixbufWriter * self) {
 
 static void pixbuf_writer_finalize (PixbufWriter* obj) {
 	PixbufWriter * self;
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXBUF_WRITER, PixbufWriter);
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_handlers_destroy (self);
-#line 694 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (self->stream);
 #line 4849 "page.c"
 }
@@ -4866,9 +4866,9 @@ GType pixbuf_writer_get_type (void) {
 gpointer pixbuf_writer_ref (gpointer instance) {
 	PixbufWriter* self;
 	self = instance;
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return instance;
 #line 4874 "page.c"
 }
@@ -4877,11 +4877,11 @@ gpointer pixbuf_writer_ref (gpointer instance) {
 void pixbuf_writer_unref (gpointer instance) {
 	PixbufWriter* self;
 	self = instance;
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		PIXBUF_WRITER_GET_CLASS (self)->finalize (self);
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/page.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 4887 "page.c"
 	}
diff --git a/src/scanner.c b/src/scanner.c
index a049b9c..d32dcd9 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -977,32 +977,32 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 
 ScanDevice* scan_device_construct (GType object_type) {
 	ScanDevice* self = NULL;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (ScanDevice*) g_type_create_instance (object_type);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 985 "scanner.c"
 }
 
 
 ScanDevice* scan_device_new (void) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_device_construct (TYPE_SCAN_DEVICE);
 #line 992 "scanner.c"
 }
 
 
 static void value_scan_device_init (GValue* value) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 999 "scanner.c"
 }
 
 
 static void value_scan_device_free_value (GValue* value) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (value->data[0].v_pointer);
 #line 1008 "scanner.c"
 	}
@@ -1010,13 +1010,13 @@ static void value_scan_device_free_value (GValue* value) {
 
 
 static void value_scan_device_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_device_ref (src_value->data[0].v_pointer);
 #line 1018 "scanner.c"
 	} else {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 1022 "scanner.c"
 	}
@@ -1024,37 +1024,37 @@ static void value_scan_device_copy_value (const GValue* src_value, GValue* dest_
 
 
 static gpointer value_scan_device_peek_pointer (const GValue* value) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 1030 "scanner.c"
 }
 
 
 static gchar* value_scan_device_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 1037 "scanner.c"
 		ScanDevice* object;
 		object = collect_values[0].v_pointer;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 1044 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 1048 "scanner.c"
 		}
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_device_ref (object);
 #line 1052 "scanner.c"
 	} else {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1056 "scanner.c"
 	}
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 1060 "scanner.c"
 }
@@ -1063,27 +1063,27 @@ static gchar* value_scan_device_collect_value (GValue* value, guint n_collect_va
 static gchar* value_scan_device_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ScanDevice** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 1071 "scanner.c"
 	}
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 1077 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 1081 "scanner.c"
 	} else {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_device_ref (value->data[0].v_pointer);
 #line 1085 "scanner.c"
 	}
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 1089 "scanner.c"
 }
@@ -1091,22 +1091,22 @@ static gchar* value_scan_device_lcopy_value (const GValue* value, guint n_collec
 
 GParamSpec* param_spec_scan_device (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanDevice* spec;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCAN_DEVICE), NULL);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 1103 "scanner.c"
 }
 
 
 gpointer value_get_scan_device (const GValue* value) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_DEVICE), NULL);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 1112 "scanner.c"
 }
@@ -1114,29 +1114,29 @@ gpointer value_get_scan_device (const GValue* value) {
 
 void value_set_scan_device (GValue* value, gpointer v_object) {
 	ScanDevice* old;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_DEVICE));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_DEVICE));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_ref (value->data[0].v_pointer);
 #line 1132 "scanner.c"
 	} else {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1136 "scanner.c"
 	}
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (old);
 #line 1142 "scanner.c"
 	}
@@ -1145,27 +1145,27 @@ void value_set_scan_device (GValue* value, gpointer v_object) {
 
 void value_take_scan_device (GValue* value, gpointer v_object) {
 	ScanDevice* old;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_DEVICE));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_DEVICE));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 1161 "scanner.c"
 	} else {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1165 "scanner.c"
 	}
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (old);
 #line 1171 "scanner.c"
 	}
@@ -1173,16 +1173,16 @@ void value_take_scan_device (GValue* value, gpointer v_object) {
 
 
 static void scan_device_class_init (ScanDeviceClass * klass) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_device_parent_class = g_type_class_peek_parent (klass);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((ScanDeviceClass *) klass)->finalize = scan_device_finalize;
 #line 1181 "scanner.c"
 }
 
 
 static void scan_device_instance_init (ScanDevice * self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 1188 "scanner.c"
 }
@@ -1190,13 +1190,13 @@ static void scan_device_instance_init (ScanDevice * self) {
 
 static void scan_device_finalize (ScanDevice* obj) {
 	ScanDevice * self;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_DEVICE, ScanDevice);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
-#line 16 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 16 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->name);
-#line 17 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 17 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->label);
 #line 1202 "scanner.c"
 }
@@ -1219,9 +1219,9 @@ GType scan_device_get_type (void) {
 gpointer scan_device_ref (gpointer instance) {
 	ScanDevice* self;
 	self = instance;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 1227 "scanner.c"
 }
@@ -1230,11 +1230,11 @@ gpointer scan_device_ref (gpointer instance) {
 void scan_device_unref (gpointer instance) {
 	ScanDevice* self;
 	self = instance;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCAN_DEVICE_GET_CLASS (self)->finalize (self);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 1240 "scanner.c"
 	}
@@ -1243,32 +1243,32 @@ void scan_device_unref (gpointer instance) {
 
 ScanPageInfo* scan_page_info_construct (GType object_type) {
 	ScanPageInfo* self = NULL;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (ScanPageInfo*) g_type_create_instance (object_type);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 1251 "scanner.c"
 }
 
 
 ScanPageInfo* scan_page_info_new (void) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_page_info_construct (TYPE_SCAN_PAGE_INFO);
 #line 1258 "scanner.c"
 }
 
 
 static void value_scan_page_info_init (GValue* value) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 1265 "scanner.c"
 }
 
 
 static void value_scan_page_info_free_value (GValue* value) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (value->data[0].v_pointer);
 #line 1274 "scanner.c"
 	}
@@ -1276,13 +1276,13 @@ static void value_scan_page_info_free_value (GValue* value) {
 
 
 static void value_scan_page_info_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_page_info_ref (src_value->data[0].v_pointer);
 #line 1284 "scanner.c"
 	} else {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 1288 "scanner.c"
 	}
@@ -1290,37 +1290,37 @@ static void value_scan_page_info_copy_value (const GValue* src_value, GValue* de
 
 
 static gpointer value_scan_page_info_peek_pointer (const GValue* value) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 1296 "scanner.c"
 }
 
 
 static gchar* value_scan_page_info_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 1303 "scanner.c"
 		ScanPageInfo* object;
 		object = collect_values[0].v_pointer;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 1310 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 1314 "scanner.c"
 		}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_page_info_ref (object);
 #line 1318 "scanner.c"
 	} else {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1322 "scanner.c"
 	}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 1326 "scanner.c"
 }
@@ -1329,27 +1329,27 @@ static gchar* value_scan_page_info_collect_value (GValue* value, guint n_collect
 static gchar* value_scan_page_info_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ScanPageInfo** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 1337 "scanner.c"
 	}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 1343 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 1347 "scanner.c"
 	} else {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_page_info_ref (value->data[0].v_pointer);
 #line 1351 "scanner.c"
 	}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 1355 "scanner.c"
 }
@@ -1357,22 +1357,22 @@ static gchar* value_scan_page_info_lcopy_value (const GValue* value, guint n_col
 
 GParamSpec* param_spec_scan_page_info (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanPageInfo* spec;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCAN_PAGE_INFO), NULL);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 1369 "scanner.c"
 }
 
 
 gpointer value_get_scan_page_info (const GValue* value) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_PAGE_INFO), NULL);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 1378 "scanner.c"
 }
@@ -1380,29 +1380,29 @@ gpointer value_get_scan_page_info (const GValue* value) {
 
 void value_set_scan_page_info (GValue* value, gpointer v_object) {
 	ScanPageInfo* old;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_PAGE_INFO));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_PAGE_INFO));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_ref (value->data[0].v_pointer);
 #line 1398 "scanner.c"
 	} else {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1402 "scanner.c"
 	}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (old);
 #line 1408 "scanner.c"
 	}
@@ -1411,27 +1411,27 @@ void value_set_scan_page_info (GValue* value, gpointer v_object) {
 
 void value_take_scan_page_info (GValue* value, gpointer v_object) {
 	ScanPageInfo* old;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_PAGE_INFO));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_PAGE_INFO));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 1427 "scanner.c"
 	} else {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1431 "scanner.c"
 	}
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (old);
 #line 1437 "scanner.c"
 	}
@@ -1439,16 +1439,16 @@ void value_take_scan_page_info (GValue* value, gpointer v_object) {
 
 
 static void scan_page_info_class_init (ScanPageInfoClass * klass) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_page_info_parent_class = g_type_class_peek_parent (klass);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((ScanPageInfoClass *) klass)->finalize = scan_page_info_finalize;
 #line 1447 "scanner.c"
 }
 
 
 static void scan_page_info_instance_init (ScanPageInfo * self) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 1454 "scanner.c"
 }
@@ -1456,11 +1456,11 @@ static void scan_page_info_instance_init (ScanPageInfo * self) {
 
 static void scan_page_info_finalize (ScanPageInfo* obj) {
 	ScanPageInfo * self;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_PAGE_INFO, ScanPageInfo);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
-#line 36 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->device);
 #line 1466 "scanner.c"
 }
@@ -1483,9 +1483,9 @@ GType scan_page_info_get_type (void) {
 gpointer scan_page_info_ref (gpointer instance) {
 	ScanPageInfo* self;
 	self = instance;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 1491 "scanner.c"
 }
@@ -1494,11 +1494,11 @@ gpointer scan_page_info_ref (gpointer instance) {
 void scan_page_info_unref (gpointer instance) {
 	ScanPageInfo* self;
 	self = instance;
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCAN_PAGE_INFO_GET_CLASS (self)->finalize (self);
-#line 20 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 1504 "scanner.c"
 	}
@@ -1507,32 +1507,32 @@ void scan_page_info_unref (gpointer instance) {
 
 ScanLine* scan_line_construct (GType object_type) {
 	ScanLine* self = NULL;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (ScanLine*) g_type_create_instance (object_type);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 1515 "scanner.c"
 }
 
 
 ScanLine* scan_line_new (void) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_line_construct (TYPE_SCAN_LINE);
 #line 1522 "scanner.c"
 }
 
 
 static void value_scan_line_init (GValue* value) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 1529 "scanner.c"
 }
 
 
 static void value_scan_line_free_value (GValue* value) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (value->data[0].v_pointer);
 #line 1538 "scanner.c"
 	}
@@ -1540,13 +1540,13 @@ static void value_scan_line_free_value (GValue* value) {
 
 
 static void value_scan_line_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_line_ref (src_value->data[0].v_pointer);
 #line 1548 "scanner.c"
 	} else {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 1552 "scanner.c"
 	}
@@ -1554,37 +1554,37 @@ static void value_scan_line_copy_value (const GValue* src_value, GValue* dest_va
 
 
 static gpointer value_scan_line_peek_pointer (const GValue* value) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 1560 "scanner.c"
 }
 
 
 static gchar* value_scan_line_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 1567 "scanner.c"
 		ScanLine* object;
 		object = collect_values[0].v_pointer;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 1574 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 1578 "scanner.c"
 		}
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_line_ref (object);
 #line 1582 "scanner.c"
 	} else {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1586 "scanner.c"
 	}
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 1590 "scanner.c"
 }
@@ -1593,27 +1593,27 @@ static gchar* value_scan_line_collect_value (GValue* value, guint n_collect_valu
 static gchar* value_scan_line_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ScanLine** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 1601 "scanner.c"
 	}
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 1607 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 1611 "scanner.c"
 	} else {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_line_ref (value->data[0].v_pointer);
 #line 1615 "scanner.c"
 	}
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 1619 "scanner.c"
 }
@@ -1621,22 +1621,22 @@ static gchar* value_scan_line_lcopy_value (const GValue* value, guint n_collect_
 
 GParamSpec* param_spec_scan_line (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanLine* spec;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCAN_LINE), NULL);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 1633 "scanner.c"
 }
 
 
 gpointer value_get_scan_line (const GValue* value) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_LINE), NULL);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 1642 "scanner.c"
 }
@@ -1644,29 +1644,29 @@ gpointer value_get_scan_line (const GValue* value) {
 
 void value_set_scan_line (GValue* value, gpointer v_object) {
 	ScanLine* old;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_LINE));
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_LINE));
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_ref (value->data[0].v_pointer);
 #line 1662 "scanner.c"
 	} else {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1666 "scanner.c"
 	}
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (old);
 #line 1672 "scanner.c"
 	}
@@ -1675,27 +1675,27 @@ void value_set_scan_line (GValue* value, gpointer v_object) {
 
 void value_take_scan_line (GValue* value, gpointer v_object) {
 	ScanLine* old;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_LINE));
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_LINE));
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 1691 "scanner.c"
 	} else {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1695 "scanner.c"
 	}
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (old);
 #line 1701 "scanner.c"
 	}
@@ -1703,16 +1703,16 @@ void value_take_scan_line (GValue* value, gpointer v_object) {
 
 
 static void scan_line_class_init (ScanLineClass * klass) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_line_parent_class = g_type_class_peek_parent (klass);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((ScanLineClass *) klass)->finalize = scan_line_finalize;
 #line 1711 "scanner.c"
 }
 
 
 static void scan_line_instance_init (ScanLine * self) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 1718 "scanner.c"
 }
@@ -1720,11 +1720,11 @@ static void scan_line_instance_init (ScanLine * self) {
 
 static void scan_line_finalize (ScanLine* obj) {
 	ScanLine * self;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_LINE, ScanLine);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
-#line 55 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 55 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->data = (g_free (self->data), NULL);
 #line 1730 "scanner.c"
 }
@@ -1747,9 +1747,9 @@ GType scan_line_get_type (void) {
 gpointer scan_line_ref (gpointer instance) {
 	ScanLine* self;
 	self = instance;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 1755 "scanner.c"
 }
@@ -1758,11 +1758,11 @@ gpointer scan_line_ref (gpointer instance) {
 void scan_line_unref (gpointer instance) {
 	ScanLine* self;
 	self = instance;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCAN_LINE_GET_CLASS (self)->finalize (self);
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 1768 "scanner.c"
 	}
@@ -1795,32 +1795,32 @@ GType scan_type_get_type (void) {
 
 ScanOptions* scan_options_construct (GType object_type) {
 	ScanOptions* self = NULL;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (ScanOptions*) g_type_create_instance (object_type);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 1803 "scanner.c"
 }
 
 
 ScanOptions* scan_options_new (void) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_options_construct (TYPE_SCAN_OPTIONS);
 #line 1810 "scanner.c"
 }
 
 
 static void value_scan_options_init (GValue* value) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 1817 "scanner.c"
 }
 
 
 static void value_scan_options_free_value (GValue* value) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (value->data[0].v_pointer);
 #line 1826 "scanner.c"
 	}
@@ -1828,13 +1828,13 @@ static void value_scan_options_free_value (GValue* value) {
 
 
 static void value_scan_options_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_options_ref (src_value->data[0].v_pointer);
 #line 1836 "scanner.c"
 	} else {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 1840 "scanner.c"
 	}
@@ -1842,37 +1842,37 @@ static void value_scan_options_copy_value (const GValue* src_value, GValue* dest
 
 
 static gpointer value_scan_options_peek_pointer (const GValue* value) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 1848 "scanner.c"
 }
 
 
 static gchar* value_scan_options_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 1855 "scanner.c"
 		ScanOptions* object;
 		object = collect_values[0].v_pointer;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 1862 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 1866 "scanner.c"
 		}
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_options_ref (object);
 #line 1870 "scanner.c"
 	} else {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1874 "scanner.c"
 	}
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 1878 "scanner.c"
 }
@@ -1881,27 +1881,27 @@ static gchar* value_scan_options_collect_value (GValue* value, guint n_collect_v
 static gchar* value_scan_options_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ScanOptions** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 1889 "scanner.c"
 	}
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 1895 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 1899 "scanner.c"
 	} else {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_options_ref (value->data[0].v_pointer);
 #line 1903 "scanner.c"
 	}
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 1907 "scanner.c"
 }
@@ -1909,22 +1909,22 @@ static gchar* value_scan_options_lcopy_value (const GValue* value, guint n_colle
 
 GParamSpec* param_spec_scan_options (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanOptions* spec;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCAN_OPTIONS), NULL);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 1921 "scanner.c"
 }
 
 
 gpointer value_get_scan_options (const GValue* value) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_OPTIONS), NULL);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 1930 "scanner.c"
 }
@@ -1932,29 +1932,29 @@ gpointer value_get_scan_options (const GValue* value) {
 
 void value_set_scan_options (GValue* value, gpointer v_object) {
 	ScanOptions* old;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_OPTIONS));
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_OPTIONS));
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_ref (value->data[0].v_pointer);
 #line 1950 "scanner.c"
 	} else {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1954 "scanner.c"
 	}
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (old);
 #line 1960 "scanner.c"
 	}
@@ -1963,27 +1963,27 @@ void value_set_scan_options (GValue* value, gpointer v_object) {
 
 void value_take_scan_options (GValue* value, gpointer v_object) {
 	ScanOptions* old;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_OPTIONS));
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_OPTIONS));
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 1979 "scanner.c"
 	} else {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 1983 "scanner.c"
 	}
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (old);
 #line 1989 "scanner.c"
 	}
@@ -1991,16 +1991,16 @@ void value_take_scan_options (GValue* value, gpointer v_object) {
 
 
 static void scan_options_class_init (ScanOptionsClass * klass) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_options_parent_class = g_type_class_peek_parent (klass);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((ScanOptionsClass *) klass)->finalize = scan_options_finalize;
 #line 1999 "scanner.c"
 }
 
 
 static void scan_options_instance_init (ScanOptions * self) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 2006 "scanner.c"
 }
@@ -2008,9 +2008,9 @@ static void scan_options_instance_init (ScanOptions * self) {
 
 static void scan_options_finalize (ScanOptions* obj) {
 	ScanOptions * self;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_OPTIONS, ScanOptions);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
 #line 2016 "scanner.c"
 }
@@ -2033,9 +2033,9 @@ GType scan_options_get_type (void) {
 gpointer scan_options_ref (gpointer instance) {
 	ScanOptions* self;
 	self = instance;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 2041 "scanner.c"
 }
@@ -2044,11 +2044,11 @@ gpointer scan_options_ref (gpointer instance) {
 void scan_options_unref (gpointer instance) {
 	ScanOptions* self;
 	self = instance;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCAN_OPTIONS_GET_CLASS (self)->finalize (self);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 2054 "scanner.c"
 	}
@@ -2057,32 +2057,32 @@ void scan_options_unref (gpointer instance) {
 
 ScanJob* scan_job_construct (GType object_type) {
 	ScanJob* self = NULL;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (ScanJob*) g_type_create_instance (object_type);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 2065 "scanner.c"
 }
 
 
 ScanJob* scan_job_new (void) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_job_construct (TYPE_SCAN_JOB);
 #line 2072 "scanner.c"
 }
 
 
 static void value_scan_job_init (GValue* value) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 2079 "scanner.c"
 }
 
 
 static void value_scan_job_free_value (GValue* value) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (value->data[0].v_pointer);
 #line 2088 "scanner.c"
 	}
@@ -2090,13 +2090,13 @@ static void value_scan_job_free_value (GValue* value) {
 
 
 static void value_scan_job_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_job_ref (src_value->data[0].v_pointer);
 #line 2098 "scanner.c"
 	} else {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 2102 "scanner.c"
 	}
@@ -2104,37 +2104,37 @@ static void value_scan_job_copy_value (const GValue* src_value, GValue* dest_val
 
 
 static gpointer value_scan_job_peek_pointer (const GValue* value) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 2110 "scanner.c"
 }
 
 
 static gchar* value_scan_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 2117 "scanner.c"
 		ScanJob* object;
 		object = collect_values[0].v_pointer;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 2124 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 2128 "scanner.c"
 		}
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_job_ref (object);
 #line 2132 "scanner.c"
 	} else {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2136 "scanner.c"
 	}
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 2140 "scanner.c"
 }
@@ -2143,27 +2143,27 @@ static gchar* value_scan_job_collect_value (GValue* value, guint n_collect_value
 static gchar* value_scan_job_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ScanJob** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 2151 "scanner.c"
 	}
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 2157 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 2161 "scanner.c"
 	} else {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_job_ref (value->data[0].v_pointer);
 #line 2165 "scanner.c"
 	}
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 2169 "scanner.c"
 }
@@ -2171,22 +2171,22 @@ static gchar* value_scan_job_lcopy_value (const GValue* value, guint n_collect_v
 
 GParamSpec* param_spec_scan_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanJob* spec;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCAN_JOB), NULL);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 2183 "scanner.c"
 }
 
 
 gpointer value_get_scan_job (const GValue* value) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_JOB), NULL);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 2192 "scanner.c"
 }
@@ -2194,29 +2194,29 @@ gpointer value_get_scan_job (const GValue* value) {
 
 void value_set_scan_job (GValue* value, gpointer v_object) {
 	ScanJob* old;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_JOB));
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_JOB));
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_ref (value->data[0].v_pointer);
 #line 2212 "scanner.c"
 	} else {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2216 "scanner.c"
 	}
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (old);
 #line 2222 "scanner.c"
 	}
@@ -2225,27 +2225,27 @@ void value_set_scan_job (GValue* value, gpointer v_object) {
 
 void value_take_scan_job (GValue* value, gpointer v_object) {
 	ScanJob* old;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_JOB));
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCAN_JOB));
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 2241 "scanner.c"
 	} else {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2245 "scanner.c"
 	}
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (old);
 #line 2251 "scanner.c"
 	}
@@ -2253,16 +2253,16 @@ void value_take_scan_job (GValue* value, gpointer v_object) {
 
 
 static void scan_job_class_init (ScanJobClass * klass) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scan_job_parent_class = g_type_class_peek_parent (klass);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((ScanJobClass *) klass)->finalize = scan_job_finalize;
 #line 2261 "scanner.c"
 }
 
 
 static void scan_job_instance_init (ScanJob * self) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 2268 "scanner.c"
 }
@@ -2270,11 +2270,11 @@ static void scan_job_instance_init (ScanJob * self) {
 
 static void scan_job_finalize (ScanJob* obj) {
 	ScanJob * self;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_JOB, ScanJob);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
-#line 90 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->device);
 #line 2280 "scanner.c"
 }
@@ -2297,9 +2297,9 @@ GType scan_job_get_type (void) {
 gpointer scan_job_ref (gpointer instance) {
 	ScanJob* self;
 	self = instance;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 2305 "scanner.c"
 }
@@ -2308,11 +2308,11 @@ gpointer scan_job_ref (gpointer instance) {
 void scan_job_unref (gpointer instance) {
 	ScanJob* self;
 	self = instance;
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCAN_JOB_GET_CLASS (self)->finalize (self);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 2318 "scanner.c"
 	}
@@ -2321,32 +2321,32 @@ void scan_job_unref (gpointer instance) {
 
 Request* request_construct (GType object_type) {
 	Request* self = NULL;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (Request*) g_type_create_instance (object_type);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 2329 "scanner.c"
 }
 
 
 Request* request_new (void) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_construct (TYPE_REQUEST);
 #line 2336 "scanner.c"
 }
 
 
 static void value_request_init (GValue* value) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 2343 "scanner.c"
 }
 
 
 static void value_request_free_value (GValue* value) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (value->data[0].v_pointer);
 #line 2352 "scanner.c"
 	}
@@ -2354,13 +2354,13 @@ static void value_request_free_value (GValue* value) {
 
 
 static void value_request_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = request_ref (src_value->data[0].v_pointer);
 #line 2362 "scanner.c"
 	} else {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 2366 "scanner.c"
 	}
@@ -2368,37 +2368,37 @@ static void value_request_copy_value (const GValue* src_value, GValue* dest_valu
 
 
 static gpointer value_request_peek_pointer (const GValue* value) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 2374 "scanner.c"
 }
 
 
 static gchar* value_request_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 2381 "scanner.c"
 		Request* object;
 		object = collect_values[0].v_pointer;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 2388 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 2392 "scanner.c"
 		}
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = request_ref (object);
 #line 2396 "scanner.c"
 	} else {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2400 "scanner.c"
 	}
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 2404 "scanner.c"
 }
@@ -2407,27 +2407,27 @@ static gchar* value_request_collect_value (GValue* value, guint n_collect_values
 static gchar* value_request_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	Request** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 2415 "scanner.c"
 	}
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 2421 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 2425 "scanner.c"
 	} else {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = request_ref (value->data[0].v_pointer);
 #line 2429 "scanner.c"
 	}
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 2433 "scanner.c"
 }
@@ -2435,22 +2435,22 @@ static gchar* value_request_lcopy_value (const GValue* value, guint n_collect_va
 
 GParamSpec* param_spec_request (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecRequest* spec;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_REQUEST), NULL);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 2447 "scanner.c"
 }
 
 
 gpointer value_get_request (const GValue* value) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_REQUEST), NULL);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 2456 "scanner.c"
 }
@@ -2458,29 +2458,29 @@ gpointer value_get_request (const GValue* value) {
 
 void value_set_request (GValue* value, gpointer v_object) {
 	Request* old;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_REQUEST));
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_REQUEST));
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_ref (value->data[0].v_pointer);
 #line 2476 "scanner.c"
 	} else {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2480 "scanner.c"
 	}
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (old);
 #line 2486 "scanner.c"
 	}
@@ -2489,27 +2489,27 @@ void value_set_request (GValue* value, gpointer v_object) {
 
 void value_take_request (GValue* value, gpointer v_object) {
 	Request* old;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_REQUEST));
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_REQUEST));
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 2505 "scanner.c"
 	} else {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2509 "scanner.c"
 	}
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (old);
 #line 2515 "scanner.c"
 	}
@@ -2517,16 +2517,16 @@ void value_take_request (GValue* value, gpointer v_object) {
 
 
 static void request_class_init (RequestClass * klass) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_parent_class = g_type_class_peek_parent (klass);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((RequestClass *) klass)->finalize = request_finalize;
 #line 2525 "scanner.c"
 }
 
 
 static void request_instance_init (Request * self) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 2532 "scanner.c"
 }
@@ -2534,9 +2534,9 @@ static void request_instance_init (Request * self) {
 
 static void request_finalize (Request* obj) {
 	Request * self;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_REQUEST, Request);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
 #line 2542 "scanner.c"
 }
@@ -2559,9 +2559,9 @@ GType request_get_type (void) {
 gpointer request_ref (gpointer instance) {
 	Request* self;
 	self = instance;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 2567 "scanner.c"
 }
@@ -2570,11 +2570,11 @@ gpointer request_ref (gpointer instance) {
 void request_unref (gpointer instance) {
 	Request* self;
 	self = instance;
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		REQUEST_GET_CLASS (self)->finalize (self);
-#line 101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 2580 "scanner.c"
 	}
@@ -2583,23 +2583,23 @@ void request_unref (gpointer instance) {
 
 RequestRedetect* request_redetect_construct (GType object_type) {
 	RequestRedetect* self = NULL;
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (RequestRedetect*) request_construct (object_type);
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 2591 "scanner.c"
 }
 
 
 RequestRedetect* request_redetect_new (void) {
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_redetect_construct (TYPE_REQUEST_REDETECT);
 #line 2598 "scanner.c"
 }
 
 
 static void request_redetect_class_init (RequestRedetectClass * klass) {
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_redetect_parent_class = g_type_class_peek_parent (klass);
 #line 2605 "scanner.c"
 }
@@ -2623,23 +2623,23 @@ GType request_redetect_get_type (void) {
 
 RequestCancel* request_cancel_construct (GType object_type) {
 	RequestCancel* self = NULL;
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (RequestCancel*) request_construct (object_type);
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 2631 "scanner.c"
 }
 
 
 RequestCancel* request_cancel_new (void) {
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_cancel_construct (TYPE_REQUEST_CANCEL);
 #line 2638 "scanner.c"
 }
 
 
 static void request_cancel_class_init (RequestCancelClass * klass) {
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_cancel_parent_class = g_type_class_peek_parent (klass);
 #line 2645 "scanner.c"
 }
@@ -2663,25 +2663,25 @@ GType request_cancel_get_type (void) {
 
 RequestStartScan* request_start_scan_construct (GType object_type) {
 	RequestStartScan* self = NULL;
-#line 107 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (RequestStartScan*) request_construct (object_type);
-#line 107 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 2671 "scanner.c"
 }
 
 
 RequestStartScan* request_start_scan_new (void) {
-#line 107 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_start_scan_construct (TYPE_REQUEST_START_SCAN);
 #line 2678 "scanner.c"
 }
 
 
 static void request_start_scan_class_init (RequestStartScanClass * klass) {
-#line 107 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_start_scan_parent_class = g_type_class_peek_parent (klass);
-#line 107 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((RequestClass *) klass)->finalize = request_start_scan_finalize;
 #line 2687 "scanner.c"
 }
@@ -2693,11 +2693,11 @@ static void request_start_scan_instance_init (RequestStartScan * self) {
 
 static void request_start_scan_finalize (Request* obj) {
 	RequestStartScan * self;
-#line 107 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_REQUEST_START_SCAN, RequestStartScan);
-#line 109 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (self->job);
-#line 107 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	REQUEST_CLASS (request_start_scan_parent_class)->finalize (obj);
 #line 2703 "scanner.c"
 }
@@ -2717,23 +2717,23 @@ GType request_start_scan_get_type (void) {
 
 RequestQuit* request_quit_construct (GType object_type) {
 	RequestQuit* self = NULL;
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (RequestQuit*) request_construct (object_type);
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 2725 "scanner.c"
 }
 
 
 RequestQuit* request_quit_new (void) {
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_quit_construct (TYPE_REQUEST_QUIT);
 #line 2732 "scanner.c"
 }
 
 
 static void request_quit_class_init (RequestQuitClass * klass) {
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_quit_parent_class = g_type_class_peek_parent (klass);
 #line 2739 "scanner.c"
 }
@@ -2757,32 +2757,32 @@ GType request_quit_get_type (void) {
 
 Credentials* credentials_construct (GType object_type) {
 	Credentials* self = NULL;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (Credentials*) g_type_create_instance (object_type);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 2765 "scanner.c"
 }
 
 
 Credentials* credentials_new (void) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return credentials_construct (TYPE_CREDENTIALS);
 #line 2772 "scanner.c"
 }
 
 
 static void value_credentials_init (GValue* value) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 2779 "scanner.c"
 }
 
 
 static void value_credentials_free_value (GValue* value) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (value->data[0].v_pointer);
 #line 2788 "scanner.c"
 	}
@@ -2790,13 +2790,13 @@ static void value_credentials_free_value (GValue* value) {
 
 
 static void value_credentials_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = credentials_ref (src_value->data[0].v_pointer);
 #line 2798 "scanner.c"
 	} else {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 2802 "scanner.c"
 	}
@@ -2804,37 +2804,37 @@ static void value_credentials_copy_value (const GValue* src_value, GValue* dest_
 
 
 static gpointer value_credentials_peek_pointer (const GValue* value) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 2810 "scanner.c"
 }
 
 
 static gchar* value_credentials_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 2817 "scanner.c"
 		Credentials* object;
 		object = collect_values[0].v_pointer;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 2824 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 2828 "scanner.c"
 		}
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = credentials_ref (object);
 #line 2832 "scanner.c"
 	} else {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2836 "scanner.c"
 	}
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 2840 "scanner.c"
 }
@@ -2843,27 +2843,27 @@ static gchar* value_credentials_collect_value (GValue* value, guint n_collect_va
 static gchar* value_credentials_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	Credentials** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 2851 "scanner.c"
 	}
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 2857 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 2861 "scanner.c"
 	} else {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = credentials_ref (value->data[0].v_pointer);
 #line 2865 "scanner.c"
 	}
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 2869 "scanner.c"
 }
@@ -2871,22 +2871,22 @@ static gchar* value_credentials_lcopy_value (const GValue* value, guint n_collec
 
 GParamSpec* param_spec_credentials (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecCredentials* spec;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_CREDENTIALS), NULL);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 2883 "scanner.c"
 }
 
 
 gpointer value_get_credentials (const GValue* value) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CREDENTIALS), NULL);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 2892 "scanner.c"
 }
@@ -2894,29 +2894,29 @@ gpointer value_get_credentials (const GValue* value) {
 
 void value_set_credentials (GValue* value, gpointer v_object) {
 	Credentials* old;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CREDENTIALS));
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_CREDENTIALS));
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_ref (value->data[0].v_pointer);
 #line 2912 "scanner.c"
 	} else {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2916 "scanner.c"
 	}
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (old);
 #line 2922 "scanner.c"
 	}
@@ -2925,27 +2925,27 @@ void value_set_credentials (GValue* value, gpointer v_object) {
 
 void value_take_credentials (GValue* value, gpointer v_object) {
 	Credentials* old;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CREDENTIALS));
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_CREDENTIALS));
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 2941 "scanner.c"
 	} else {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 2945 "scanner.c"
 	}
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (old);
 #line 2951 "scanner.c"
 	}
@@ -2953,16 +2953,16 @@ void value_take_credentials (GValue* value, gpointer v_object) {
 
 
 static void credentials_class_init (CredentialsClass * klass) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials_parent_class = g_type_class_peek_parent (klass);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((CredentialsClass *) klass)->finalize = credentials_finalize;
 #line 2961 "scanner.c"
 }
 
 
 static void credentials_instance_init (Credentials * self) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 2968 "scanner.c"
 }
@@ -2970,13 +2970,13 @@ static void credentials_instance_init (Credentials * self) {
 
 static void credentials_finalize (Credentials* obj) {
 	Credentials * self;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CREDENTIALS, Credentials);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->username);
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->password);
 #line 2982 "scanner.c"
 }
@@ -2999,9 +2999,9 @@ GType credentials_get_type (void) {
 gpointer credentials_ref (gpointer instance) {
 	Credentials* self;
 	self = instance;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 3007 "scanner.c"
 }
@@ -3010,11 +3010,11 @@ gpointer credentials_ref (gpointer instance) {
 void credentials_unref (gpointer instance) {
 	Credentials* self;
 	self = instance;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		CREDENTIALS_GET_CLASS (self)->finalize (self);
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 3020 "scanner.c"
 	}
@@ -3034,16 +3034,16 @@ GType scan_state_get_type (void) {
 
 
 static void notify_real_run (Notify* self, Scanner* scanner) {
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
 #line 3040 "scanner.c"
 }
 
 
 void notify_run (Notify* self, Scanner* scanner) {
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_GET_CLASS (self)->run (self, scanner);
 #line 3049 "scanner.c"
 }
@@ -3051,32 +3051,32 @@ void notify_run (Notify* self, Scanner* scanner) {
 
 Notify* notify_construct (GType object_type) {
 	Notify* self = NULL;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (Notify*) g_type_create_instance (object_type);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3059 "scanner.c"
 }
 
 
 Notify* notify_new (void) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_construct (TYPE_NOTIFY);
 #line 3066 "scanner.c"
 }
 
 
 static void value_notify_init (GValue* value) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 3073 "scanner.c"
 }
 
 
 static void value_notify_free_value (GValue* value) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (value->data[0].v_pointer);
 #line 3082 "scanner.c"
 	}
@@ -3084,13 +3084,13 @@ static void value_notify_free_value (GValue* value) {
 
 
 static void value_notify_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = notify_ref (src_value->data[0].v_pointer);
 #line 3092 "scanner.c"
 	} else {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 3096 "scanner.c"
 	}
@@ -3098,37 +3098,37 @@ static void value_notify_copy_value (const GValue* src_value, GValue* dest_value
 
 
 static gpointer value_notify_peek_pointer (const GValue* value) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 3104 "scanner.c"
 }
 
 
 static gchar* value_notify_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 3111 "scanner.c"
 		Notify* object;
 		object = collect_values[0].v_pointer;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 3118 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 3122 "scanner.c"
 		}
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = notify_ref (object);
 #line 3126 "scanner.c"
 	} else {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 3130 "scanner.c"
 	}
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 3134 "scanner.c"
 }
@@ -3137,27 +3137,27 @@ static gchar* value_notify_collect_value (GValue* value, guint n_collect_values,
 static gchar* value_notify_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	Notify** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 3145 "scanner.c"
 	}
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 3151 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 3155 "scanner.c"
 	} else {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = notify_ref (value->data[0].v_pointer);
 #line 3159 "scanner.c"
 	}
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 3163 "scanner.c"
 }
@@ -3165,22 +3165,22 @@ static gchar* value_notify_lcopy_value (const GValue* value, guint n_collect_val
 
 GParamSpec* param_spec_notify (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecNotify* spec;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_NOTIFY), NULL);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 3177 "scanner.c"
 }
 
 
 gpointer value_get_notify (const GValue* value) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFY), NULL);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 3186 "scanner.c"
 }
@@ -3188,29 +3188,29 @@ gpointer value_get_notify (const GValue* value) {
 
 void value_set_notify (GValue* value, gpointer v_object) {
 	Notify* old;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFY));
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_NOTIFY));
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_ref (value->data[0].v_pointer);
 #line 3206 "scanner.c"
 	} else {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 3210 "scanner.c"
 	}
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (old);
 #line 3216 "scanner.c"
 	}
@@ -3219,27 +3219,27 @@ void value_set_notify (GValue* value, gpointer v_object) {
 
 void value_take_notify (GValue* value, gpointer v_object) {
 	Notify* old;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFY));
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_NOTIFY));
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 3235 "scanner.c"
 	} else {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 3239 "scanner.c"
 	}
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (old);
 #line 3245 "scanner.c"
 	}
@@ -3247,18 +3247,18 @@ void value_take_notify (GValue* value, gpointer v_object) {
 
 
 static void notify_class_init (NotifyClass * klass) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_parent_class = g_type_class_peek_parent (klass);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->finalize = notify_finalize;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_real_run;
 #line 3257 "scanner.c"
 }
 
 
 static void notify_instance_init (Notify * self) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 3264 "scanner.c"
 }
@@ -3266,9 +3266,9 @@ static void notify_instance_init (Notify * self) {
 
 static void notify_finalize (Notify* obj) {
 	Notify * self;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY, Notify);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
 #line 3274 "scanner.c"
 }
@@ -3291,9 +3291,9 @@ GType notify_get_type (void) {
 gpointer notify_ref (gpointer instance) {
 	Notify* self;
 	self = instance;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 3299 "scanner.c"
 }
@@ -3302,11 +3302,11 @@ gpointer notify_ref (gpointer instance) {
 void notify_unref (gpointer instance) {
 	Notify* self;
 	self = instance;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		NOTIFY_GET_CLASS (self)->finalize (self);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 3312 "scanner.c"
 	}
@@ -3316,13 +3316,13 @@ void notify_unref (gpointer instance) {
 static void notify_scanning_changed_real_run (Notify* base, Scanner* scanner) {
 	NotifyScanningChanged * self;
 	Scanner* _tmp0_ = NULL;
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyScanningChanged*) base;
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "scanning-changed");
 #line 3328 "scanner.c"
 }
@@ -3330,25 +3330,25 @@ static void notify_scanning_changed_real_run (Notify* base, Scanner* scanner) {
 
 NotifyScanningChanged* notify_scanning_changed_construct (GType object_type) {
 	NotifyScanningChanged* self = NULL;
-#line 136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyScanningChanged*) notify_construct (object_type);
-#line 136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3338 "scanner.c"
 }
 
 
 NotifyScanningChanged* notify_scanning_changed_new (void) {
-#line 136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_scanning_changed_construct (TYPE_NOTIFY_SCANNING_CHANGED);
 #line 3345 "scanner.c"
 }
 
 
 static void notify_scanning_changed_class_init (NotifyScanningChangedClass * klass) {
-#line 136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_scanning_changed_parent_class = g_type_class_peek_parent (klass);
-#line 136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_scanning_changed_real_run;
 #line 3354 "scanner.c"
 }
@@ -3371,16 +3371,16 @@ GType notify_scanning_changed_get_type (void) {
 
 
 static void _scan_device_unref0_ (gpointer var) {
-#line 144 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (scan_device_unref (var), NULL));
 #line 3377 "scanner.c"
 }
 
 
 static void _g_list_free__scan_device_unref0_ (GList* self) {
-#line 144 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_foreach (self, (GFunc) _scan_device_unref0_, NULL);
-#line 144 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_free (self);
 #line 3386 "scanner.c"
 }
@@ -3389,26 +3389,26 @@ static void _g_list_free__scan_device_unref0_ (GList* self) {
 NotifyUpdateDevices* notify_update_devices_construct (GType object_type, GList* devices) {
 	NotifyUpdateDevices* self = NULL;
 	GList* _tmp0_ = NULL;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyUpdateDevices*) notify_construct (object_type);
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = devices;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = NULL;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (self->priv->devices);
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->devices = _tmp0_;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (devices);
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3407 "scanner.c"
 }
 
 
 NotifyUpdateDevices* notify_update_devices_new (GList* devices) {
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_update_devices_construct (TYPE_NOTIFY_UPDATE_DEVICES, devices);
 #line 3414 "scanner.c"
 }
@@ -3418,35 +3418,35 @@ static void notify_update_devices_real_run (Notify* base, Scanner* scanner) {
 	NotifyUpdateDevices * self;
 	Scanner* _tmp0_ = NULL;
 	GList* _tmp1_ = NULL;
-#line 145 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyUpdateDevices*) base;
-#line 145 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 145 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
-#line 145 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->devices;
-#line 145 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "update-devices", _tmp1_);
 #line 3432 "scanner.c"
 }
 
 
 static void notify_update_devices_class_init (NotifyUpdateDevicesClass * klass) {
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_update_devices_parent_class = g_type_class_peek_parent (klass);
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->finalize = notify_update_devices_finalize;
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyUpdateDevicesPrivate));
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_update_devices_real_run;
 #line 3445 "scanner.c"
 }
 
 
 static void notify_update_devices_instance_init (NotifyUpdateDevices * self) {
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_UPDATE_DEVICES_GET_PRIVATE (self);
 #line 3452 "scanner.c"
 }
@@ -3454,11 +3454,11 @@ static void notify_update_devices_instance_init (NotifyUpdateDevices * self) {
 
 static void notify_update_devices_finalize (Notify* obj) {
 	NotifyUpdateDevices * self;
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_UPDATE_DEVICES, NotifyUpdateDevices);
-#line 144 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (self->priv->devices);
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_update_devices_parent_class)->finalize (obj);
 #line 3464 "scanner.c"
 }
@@ -3480,26 +3480,26 @@ NotifyRequestAuthorization* notify_request_authorization_construct (GType object
 	NotifyRequestAuthorization* self = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (resource != NULL, NULL);
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyRequestAuthorization*) notify_construct (object_type);
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = resource;
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->resource);
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->resource = _tmp1_;
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3498 "scanner.c"
 }
 
 
 NotifyRequestAuthorization* notify_request_authorization_new (const gchar* resource) {
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_request_authorization_construct (TYPE_NOTIFY_REQUEST_AUTHORIZATION, resource);
 #line 3505 "scanner.c"
 }
@@ -3509,35 +3509,35 @@ static void notify_request_authorization_real_run (Notify* base, Scanner* scanne
 	NotifyRequestAuthorization * self;
 	Scanner* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 152 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyRequestAuthorization*) base;
-#line 152 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 152 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
-#line 152 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->resource;
-#line 152 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "request-authorization", _tmp1_);
 #line 3523 "scanner.c"
 }
 
 
 static void notify_request_authorization_class_init (NotifyRequestAuthorizationClass * klass) {
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_request_authorization_parent_class = g_type_class_peek_parent (klass);
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->finalize = notify_request_authorization_finalize;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyRequestAuthorizationPrivate));
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_request_authorization_real_run;
 #line 3536 "scanner.c"
 }
 
 
 static void notify_request_authorization_instance_init (NotifyRequestAuthorization * self) {
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_REQUEST_AUTHORIZATION_GET_PRIVATE (self);
 #line 3543 "scanner.c"
 }
@@ -3545,11 +3545,11 @@ static void notify_request_authorization_instance_init (NotifyRequestAuthorizati
 
 static void notify_request_authorization_finalize (Notify* obj) {
 	NotifyRequestAuthorization * self;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_REQUEST_AUTHORIZATION, NotifyRequestAuthorization);
-#line 151 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->resource);
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_request_authorization_parent_class)->finalize (obj);
 #line 3555 "scanner.c"
 }
@@ -3572,30 +3572,30 @@ NotifyScanFailed* notify_scan_failed_construct (GType object_type, gint error_co
 	gint _tmp0_ = 0;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (error_string != NULL, NULL);
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyScanFailed*) notify_construct (object_type);
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = error_code;
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->error_code = _tmp0_;
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = error_string;
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->error_string);
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->error_string = _tmp2_;
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3594 "scanner.c"
 }
 
 
 NotifyScanFailed* notify_scan_failed_new (gint error_code, const gchar* error_string) {
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_scan_failed_construct (TYPE_NOTIFY_SCAN_FAILED, error_code, error_string);
 #line 3601 "scanner.c"
 }
@@ -3606,37 +3606,37 @@ static void notify_scan_failed_real_run (Notify* base, Scanner* scanner) {
 	Scanner* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	const gchar* _tmp2_ = NULL;
-#line 160 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyScanFailed*) base;
-#line 160 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 160 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
-#line 160 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->error_code;
-#line 160 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->error_string;
-#line 160 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "scan-failed", _tmp1_, _tmp2_);
 #line 3622 "scanner.c"
 }
 
 
 static void notify_scan_failed_class_init (NotifyScanFailedClass * klass) {
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_scan_failed_parent_class = g_type_class_peek_parent (klass);
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->finalize = notify_scan_failed_finalize;
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyScanFailedPrivate));
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_scan_failed_real_run;
 #line 3635 "scanner.c"
 }
 
 
 static void notify_scan_failed_instance_init (NotifyScanFailed * self) {
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_SCAN_FAILED_GET_PRIVATE (self);
 #line 3642 "scanner.c"
 }
@@ -3644,11 +3644,11 @@ static void notify_scan_failed_instance_init (NotifyScanFailed * self) {
 
 static void notify_scan_failed_finalize (Notify* obj) {
 	NotifyScanFailed * self;
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_SCAN_FAILED, NotifyScanFailed);
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->error_string);
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_scan_failed_parent_class)->finalize (obj);
 #line 3654 "scanner.c"
 }
@@ -3669,13 +3669,13 @@ GType notify_scan_failed_get_type (void) {
 static void notify_document_done_real_run (Notify* base, Scanner* scanner) {
 	NotifyDocumentDone * self;
 	Scanner* _tmp0_ = NULL;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyDocumentDone*) base;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "document-done");
 #line 3681 "scanner.c"
 }
@@ -3683,25 +3683,25 @@ static void notify_document_done_real_run (Notify* base, Scanner* scanner) {
 
 NotifyDocumentDone* notify_document_done_construct (GType object_type) {
 	NotifyDocumentDone* self = NULL;
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyDocumentDone*) notify_construct (object_type);
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3691 "scanner.c"
 }
 
 
 NotifyDocumentDone* notify_document_done_new (void) {
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_document_done_construct (TYPE_NOTIFY_DOCUMENT_DONE);
 #line 3698 "scanner.c"
 }
 
 
 static void notify_document_done_class_init (NotifyDocumentDoneClass * klass) {
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_document_done_parent_class = g_type_class_peek_parent (klass);
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_document_done_real_run;
 #line 3707 "scanner.c"
 }
@@ -3726,13 +3726,13 @@ GType notify_document_done_get_type (void) {
 static void notify_expect_page_real_run (Notify* base, Scanner* scanner) {
 	NotifyExpectPage * self;
 	Scanner* _tmp0_ = NULL;
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyExpectPage*) base;
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner;
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "expect-page");
 #line 3738 "scanner.c"
 }
@@ -3740,25 +3740,25 @@ static void notify_expect_page_real_run (Notify* base, Scanner* scanner) {
 
 NotifyExpectPage* notify_expect_page_construct (GType object_type) {
 	NotifyExpectPage* self = NULL;
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyExpectPage*) notify_construct (object_type);
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3748 "scanner.c"
 }
 
 
 NotifyExpectPage* notify_expect_page_new (void) {
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_expect_page_construct (TYPE_NOTIFY_EXPECT_PAGE);
 #line 3755 "scanner.c"
 }
 
 
 static void notify_expect_page_class_init (NotifyExpectPageClass * klass) {
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_expect_page_parent_class = g_type_class_peek_parent (klass);
-#line 168 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_expect_page_real_run;
 #line 3764 "scanner.c"
 }
@@ -3781,7 +3781,7 @@ GType notify_expect_page_get_type (void) {
 
 
 static gpointer _scan_page_info_ref0 (gpointer self) {
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_page_info_ref (self) : NULL;
 #line 3787 "scanner.c"
 }
@@ -3792,30 +3792,30 @@ NotifyGotPageInfo* notify_got_page_info_construct (GType object_type, gint job_i
 	gint _tmp0_ = 0;
 	ScanPageInfo* _tmp1_ = NULL;
 	ScanPageInfo* _tmp2_ = NULL;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (info != NULL, NULL);
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotPageInfo*) notify_construct (object_type);
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = job_id;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_id = _tmp0_;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = info;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_page_info_ref0 (_tmp1_);
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_page_info_unref0 (self->priv->info);
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->info = _tmp2_;
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3814 "scanner.c"
 }
 
 
 NotifyGotPageInfo* notify_got_page_info_new (gint job_id, ScanPageInfo* info) {
-#line 175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_got_page_info_construct (TYPE_NOTIFY_GOT_PAGE_INFO, job_id, info);
 #line 3821 "scanner.c"
 }
@@ -3827,46 +3827,46 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 	gint _tmp1_ = 0;
 	Scanner* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
-#line 178 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotPageInfo*) base;
-#line 178 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->job_id;
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner;
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->first_job_id;
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
 #line 3843 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = self->priv->job_id;
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = scanner;
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->job_id;
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
 #line 3855 "scanner.c"
 	} else {
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
 #line 3859 "scanner.c"
 	}
-#line 180 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
 #line 3863 "scanner.c"
 		Scanner* _tmp7_ = NULL;
 		ScanPageInfo* _tmp8_ = NULL;
-#line 181 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = scanner;
-#line 181 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = self->priv->info;
-#line 181 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp7_, "got-page-info", _tmp8_);
 #line 3872 "scanner.c"
 	}
@@ -3874,20 +3874,20 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 
 
 static void notify_got_page_info_class_init (NotifyGotPageInfoClass * klass) {
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_got_page_info_parent_class = g_type_class_peek_parent (klass);
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->finalize = notify_got_page_info_finalize;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyGotPageInfoPrivate));
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_got_page_info_real_run;
 #line 3886 "scanner.c"
 }
 
 
 static void notify_got_page_info_instance_init (NotifyGotPageInfo * self) {
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_GOT_PAGE_INFO_GET_PRIVATE (self);
 #line 3893 "scanner.c"
 }
@@ -3895,11 +3895,11 @@ static void notify_got_page_info_instance_init (NotifyGotPageInfo * self) {
 
 static void notify_got_page_info_finalize (Notify* obj) {
 	NotifyGotPageInfo * self;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_GOT_PAGE_INFO, NotifyGotPageInfo);
-#line 177 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_page_info_unref0 (self->priv->info);
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_got_page_info_parent_class)->finalize (obj);
 #line 3905 "scanner.c"
 }
@@ -3920,20 +3920,20 @@ GType notify_got_page_info_get_type (void) {
 NotifyPageDone* notify_page_done_construct (GType object_type, gint job_id) {
 	NotifyPageDone* self = NULL;
 	gint _tmp0_ = 0;
-#line 187 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyPageDone*) notify_construct (object_type);
-#line 187 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = job_id;
-#line 187 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_id = _tmp0_;
-#line 187 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 3932 "scanner.c"
 }
 
 
 NotifyPageDone* notify_page_done_new (gint job_id) {
-#line 187 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_page_done_construct (TYPE_NOTIFY_PAGE_DONE, job_id);
 #line 3939 "scanner.c"
 }
@@ -3945,43 +3945,43 @@ static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 	gint _tmp1_ = 0;
 	Scanner* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
-#line 189 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyPageDone*) base;
-#line 189 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->job_id;
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner;
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->first_job_id;
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
 #line 3961 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = self->priv->job_id;
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = scanner;
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->job_id;
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
 #line 3973 "scanner.c"
 	} else {
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
 #line 3977 "scanner.c"
 	}
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
 #line 3981 "scanner.c"
 		Scanner* _tmp7_ = NULL;
-#line 192 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = scanner;
-#line 192 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp7_, "page-done");
 #line 3987 "scanner.c"
 	}
@@ -3989,20 +3989,20 @@ static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 
 
 static void notify_page_done_class_init (NotifyPageDoneClass * klass) {
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_page_done_parent_class = g_type_class_peek_parent (klass);
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->finalize = notify_page_done_finalize;
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyPageDonePrivate));
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_page_done_real_run;
 #line 4001 "scanner.c"
 }
 
 
 static void notify_page_done_instance_init (NotifyPageDone * self) {
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_PAGE_DONE_GET_PRIVATE (self);
 #line 4008 "scanner.c"
 }
@@ -4010,9 +4010,9 @@ static void notify_page_done_instance_init (NotifyPageDone * self) {
 
 static void notify_page_done_finalize (Notify* obj) {
 	NotifyPageDone * self;
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_PAGE_DONE, NotifyPageDone);
-#line 185 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_page_done_parent_class)->finalize (obj);
 #line 4018 "scanner.c"
 }
@@ -4031,7 +4031,7 @@ GType notify_page_done_get_type (void) {
 
 
 static gpointer _scan_line_ref0 (gpointer self) {
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_line_ref (self) : NULL;
 #line 4037 "scanner.c"
 }
@@ -4042,30 +4042,30 @@ NotifyGotLine* notify_got_line_construct (GType object_type, gint job_id, ScanLi
 	gint _tmp0_ = 0;
 	ScanLine* _tmp1_ = NULL;
 	ScanLine* _tmp2_ = NULL;
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (line != NULL, NULL);
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotLine*) notify_construct (object_type);
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = job_id;
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_id = _tmp0_;
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = line;
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_line_ref0 (_tmp1_);
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_line_unref0 (self->priv->line);
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->line = _tmp2_;
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 4064 "scanner.c"
 }
 
 
 NotifyGotLine* notify_got_line_new (gint job_id, ScanLine* line) {
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_got_line_construct (TYPE_NOTIFY_GOT_LINE, job_id, line);
 #line 4071 "scanner.c"
 }
@@ -4077,46 +4077,46 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 	gint _tmp1_ = 0;
 	Scanner* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
-#line 201 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotLine*) base;
-#line 201 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->job_id;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->first_job_id;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
 #line 4093 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = self->priv->job_id;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = scanner;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->job_id;
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
 #line 4105 "scanner.c"
 	} else {
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
 #line 4109 "scanner.c"
 	}
-#line 203 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
 #line 4113 "scanner.c"
 		Scanner* _tmp7_ = NULL;
 		ScanLine* _tmp8_ = NULL;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = scanner;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = self->priv->line;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp7_, "got-line", _tmp8_);
 #line 4122 "scanner.c"
 	}
@@ -4124,20 +4124,20 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 
 
 static void notify_got_line_class_init (NotifyGotLineClass * klass) {
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_got_line_parent_class = g_type_class_peek_parent (klass);
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->finalize = notify_got_line_finalize;
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (NotifyGotLinePrivate));
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_got_line_real_run;
 #line 4136 "scanner.c"
 }
 
 
 static void notify_got_line_instance_init (NotifyGotLine * self) {
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_GOT_LINE_GET_PRIVATE (self);
 #line 4143 "scanner.c"
 }
@@ -4145,11 +4145,11 @@ static void notify_got_line_instance_init (NotifyGotLine * self) {
 
 static void notify_got_line_finalize (Notify* obj) {
 	NotifyGotLine * self;
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_GOT_LINE, NotifyGotLine);
-#line 200 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_line_unref0 (self->priv->line);
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_got_line_parent_class)->finalize (obj);
 #line 4155 "scanner.c"
 }
@@ -4168,37 +4168,37 @@ GType notify_got_line_get_type (void) {
 
 
 static void _scan_job_unref0_ (gpointer var) {
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (scan_job_unref (var), NULL));
 #line 4174 "scanner.c"
 }
 
 
 static void _g_list_free__scan_job_unref0_ (GList* self) {
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_foreach (self, (GFunc) _scan_job_unref0_, NULL);
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_free (self);
 #line 4183 "scanner.c"
 }
 
 
 static void _request_unref0_ (gpointer var) {
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (request_unref (var), NULL));
 #line 4190 "scanner.c"
 }
 
 
 static void _notify_unref0_ (gpointer var) {
-#line 274 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (notify_unref (var), NULL));
 #line 4197 "scanner.c"
 }
 
 
 static void _credentials_unref0_ (gpointer var) {
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (credentials_unref (var), NULL));
 #line 4204 "scanner.c"
 }
@@ -4209,41 +4209,41 @@ static Scanner* scanner_construct (GType object_type) {
 	GAsyncQueue* _tmp0_ = NULL;
 	GAsyncQueue* _tmp1_ = NULL;
 	GAsyncQueue* _tmp2_ = NULL;
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (Scanner*) g_type_create_instance (object_type);
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = g_async_queue_new_full (_request_unref0_);
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->request_queue);
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->request_queue = _tmp0_;
-#line 274 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = g_async_queue_new_full (_notify_unref0_);
-#line 274 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->notify_queue);
-#line 274 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->notify_queue = _tmp1_;
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_async_queue_new_full (_credentials_unref0_);
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->authorize_queue);
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->authorize_queue = _tmp2_;
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
 #line 4235 "scanner.c"
 }
 
 
 static Scanner* scanner_new (void) {
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scanner_construct (TYPE_SCANNER);
 #line 4242 "scanner.c"
 }
 
 
 static gpointer _scanner_ref0 (gpointer self) {
-#line 282 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scanner_ref (self) : NULL;
 #line 4249 "scanner.c"
 }
@@ -4254,27 +4254,27 @@ Scanner* scanner_get_instance (void) {
 	Scanner* _tmp0_ = NULL;
 	Scanner* _tmp2_ = NULL;
 	Scanner* _tmp3_ = NULL;
-#line 280 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner_scanner_object;
-#line 280 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_ == NULL) {
 #line 4262 "scanner.c"
 		Scanner* _tmp1_ = NULL;
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = scanner_new ();
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scanner_unref0 (scanner_scanner_object);
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_scanner_object = _tmp1_;
 #line 4270 "scanner.c"
 	}
-#line 282 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner_scanner_object;
-#line 282 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _scanner_ref0 (_tmp2_);
-#line 282 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp3_;
-#line 282 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 4280 "scanner.c"
 }
@@ -4285,28 +4285,28 @@ static gboolean scanner_notify_idle_cb (Scanner* self) {
 	Notify* notification = NULL;
 	GAsyncQueue* _tmp0_ = NULL;
 	gpointer _tmp1_ = NULL;
-#line 285 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->notify_queue;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = g_async_queue_pop (_tmp0_);
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notification = (Notify*) _tmp1_;
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	notify_run (notification, self);
-#line 289 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = FALSE;
-#line 289 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (notification);
-#line 289 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 289 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 4305 "scanner.c"
 }
 
 
 static gpointer _notify_ref0 (gpointer self) {
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? notify_ref (self) : NULL;
 #line 4312 "scanner.c"
 }
@@ -4315,7 +4315,7 @@ static gpointer _notify_ref0 (gpointer self) {
 static gboolean _scanner_notify_idle_cb_gsource_func (gpointer self) {
 	gboolean result;
 	result = scanner_notify_idle_cb ((Scanner*) self);
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 4321 "scanner.c"
 }
@@ -4325,19 +4325,19 @@ static void scanner_notify (Scanner* self, Notify* notification) {
 	GAsyncQueue* _tmp0_ = NULL;
 	Notify* _tmp1_ = NULL;
 	Notify* _tmp2_ = NULL;
-#line 292 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 292 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 292 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (notification != NULL);
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->notify_queue;
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = notification;
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _notify_ref0 (_tmp1_);
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp0_, _tmp2_);
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _scanner_notify_idle_cb_gsource_func, scanner_ref (self), scanner_unref);
 #line 4343 "scanner.c"
 }
@@ -4347,69 +4347,69 @@ static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 298 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->scanning;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_) {
 #line 4357 "scanner.c"
 		gboolean _tmp3_ = FALSE;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = is_scanning;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = !_tmp3_;
 #line 4363 "scanner.c"
 	} else {
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = FALSE;
 #line 4367 "scanner.c"
 	}
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_) {
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = TRUE;
 #line 4373 "scanner.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = self->priv->scanning;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (!_tmp5_) {
 #line 4381 "scanner.c"
 			gboolean _tmp6_ = FALSE;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = is_scanning;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = _tmp6_;
 #line 4387 "scanner.c"
 		} else {
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = FALSE;
 #line 4391 "scanner.c"
 		}
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_;
 #line 4395 "scanner.c"
 	}
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
 #line 4399 "scanner.c"
 		gboolean _tmp7_ = FALSE;
 		NotifyScanningChanged* _tmp8_ = NULL;
 		NotifyScanningChanged* _tmp9_ = NULL;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = is_scanning;
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->scanning = _tmp7_;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = notify_scanning_changed_new ();
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = _tmp8_;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp9_);
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp9_);
 #line 4415 "scanner.c"
 	}
@@ -4442,35 +4442,35 @@ static gint scanner_get_device_weight (const gchar* device) {
 	gboolean _tmp1_ = FALSE;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 307 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (device != NULL, 0);
-#line 312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = device;
-#line 312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = g_str_has_prefix (_tmp0_, "vfl:");
-#line 312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_) {
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = 2;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
 #line 4458 "scanner.c"
 	}
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = device;
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = string_contains (_tmp2_, "usb");
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp3_) {
-#line 317 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = 0;
-#line 317 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
 #line 4470 "scanner.c"
 	}
-#line 319 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = 1;
-#line 319 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 4476 "scanner.c"
 }
@@ -4494,60 +4494,60 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 	ScanDevice* _tmp13_ = NULL;
 	const gchar* _tmp14_ = NULL;
 	gint _tmp15_ = 0;
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (device1 != NULL, 0);
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (device2 != NULL, 0);
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = device1;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->name;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner_get_device_weight (_tmp1_);
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	weight1 = _tmp2_;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = device2;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->name;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = scanner_get_device_weight (_tmp4_);
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	weight2 = _tmp5_;
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = weight1;
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = weight2;
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != _tmp7_) {
 #line 4524 "scanner.c"
 		gint _tmp8_ = 0;
 		gint _tmp9_ = 0;
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = weight1;
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = weight2;
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = _tmp8_ - _tmp9_;
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
 #line 4535 "scanner.c"
 	}
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = g_strcmp0;
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = device1;
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = _tmp11_->label;
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = device2;
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = _tmp13_->label;
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = _tmp10_ (_tmp12_, _tmp14_);
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp15_;
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 4553 "scanner.c"
 }
@@ -4556,163 +4556,163 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 static gchar* sane_status_to_string (SANE_Status status) {
 	gchar* result = NULL;
 	SANE_Status _tmp0_ = 0;
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	_tmp0_ = status;
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	switch (_tmp0_) {
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_GOOD:
 #line 4566 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 57 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp1_ = g_strdup ("SANE_STATUS_GOOD");
-#line 57 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp1_;
-#line 57 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4575 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_UNSUPPORTED:
 #line 4579 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp2_ = g_strdup ("SANE_STATUS_UNSUPPORTED");
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp2_;
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4588 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_CANCELLED:
 #line 4592 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 61 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp3_ = g_strdup ("SANE_STATUS_CANCELLED");
-#line 61 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp3_;
-#line 61 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4601 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_DEVICE_BUSY:
 #line 4605 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
-#line 63 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp4_ = g_strdup ("SANE_STATUS_DEVICE_BUSY");
-#line 63 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp4_;
-#line 63 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4614 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_INVAL:
 #line 4618 "scanner.c"
 		{
 			gchar* _tmp5_ = NULL;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp5_ = g_strdup ("SANE_STATUS_INVAL");
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp5_;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4627 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_EOF:
 #line 4631 "scanner.c"
 		{
 			gchar* _tmp6_ = NULL;
-#line 67 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp6_ = g_strdup ("SANE_STATUS_EOF");
-#line 67 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp6_;
-#line 67 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4640 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_JAMMED:
 #line 4644 "scanner.c"
 		{
 			gchar* _tmp7_ = NULL;
-#line 69 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp7_ = g_strdup ("SANE_STATUS_JAMMED");
-#line 69 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp7_;
-#line 69 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4653 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_DOCS:
 #line 4657 "scanner.c"
 		{
 			gchar* _tmp8_ = NULL;
-#line 71 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp8_ = g_strdup ("SANE_STATUS_NO_DOCS");
-#line 71 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp8_;
-#line 71 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4666 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_COVER_OPEN:
 #line 4670 "scanner.c"
 		{
 			gchar* _tmp9_ = NULL;
-#line 73 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp9_ = g_strdup ("SANE_STATUS_COVER_OPEN");
-#line 73 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp9_;
-#line 73 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4679 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_IO_ERROR:
 #line 4683 "scanner.c"
 		{
 			gchar* _tmp10_ = NULL;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp10_ = g_strdup ("SANE_STATUS_IO_ERROR");
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp10_;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4692 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_MEM:
 #line 4696 "scanner.c"
 		{
 			gchar* _tmp11_ = NULL;
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp11_ = g_strdup ("SANE_STATUS_NO_MEM");
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp11_;
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4705 "scanner.c"
 		}
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_ACCESS_DENIED:
 #line 4709 "scanner.c"
 		{
 			gchar* _tmp12_ = NULL;
-#line 79 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp12_ = g_strdup ("SANE_STATUS_ACCESS_DENIED");
-#line 79 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp12_;
-#line 79 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4718 "scanner.c"
 		}
@@ -4720,13 +4720,13 @@ static gchar* sane_status_to_string (SANE_Status status) {
 		{
 			SANE_Status _tmp13_ = 0;
 			gchar* _tmp14_ = NULL;
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp13_ = status;
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp14_ = g_strdup_printf ("SANE_STATUS(%d)", (gint) _tmp13_);
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp14_;
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 4732 "scanner.c"
 		}
@@ -4855,7 +4855,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 
 
 static gpointer _scan_device_ref0 (gpointer self) {
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_device_ref (self) : NULL;
 #line 4861 "scanner.c"
 }
@@ -4864,7 +4864,7 @@ static gpointer _scan_device_ref0 (gpointer self) {
 static gint _scanner_compare_devices_gcompare_func (gconstpointer a, gconstpointer b) {
 	gint result;
 	result = scanner_compare_devices ((ScanDevice*) a, (ScanDevice*) b);
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 4870 "scanner.c"
 }
@@ -4886,68 +4886,68 @@ static void scanner_do_redetect (Scanner* self) {
 	GList* _tmp63_ = NULL;
 	NotifyUpdateDevices* _tmp64_ = NULL;
 	NotifyUpdateDevices* _tmp65_ = NULL;
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 336 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	device_list = NULL;
-#line 336 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	device_list_length1 = 0;
-#line 336 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_device_list_size_ = device_list_length1;
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = sane_get_devices (&_tmp0_, FALSE);
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	device_list = _tmp0_;
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	device_list_length1 = -1;
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_device_list_size_ = device_list_length1;
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp1_;
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = status;
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = sane_status_to_string (_tmp2_);
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_;
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:338: sane_get_devices () -> %s", _tmp4_);
-#line 338 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp4_);
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = status;
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
 #line 4922 "scanner.c"
 		SANE_Status _tmp6_ = 0;
 		const gchar* _tmp7_ = NULL;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = status;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = sane_strstatus (_tmp6_);
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:341: Unable to get SANE devices: %s", _tmp7_);
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->need_redetect = FALSE;
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_IDLE;
-#line 344 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 4937 "scanner.c"
 	}
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = NULL;
 #line 4941 "scanner.c"
 	{
 		gint i = 0;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
 #line 4946 "scanner.c"
 		{
 			gboolean _tmp8_ = FALSE;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp8_ = TRUE;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
 #line 4953 "scanner.c"
 				SANE_Device** _tmp10_ = NULL;
@@ -5005,178 +5005,178 @@ static void scanner_do_redetect (Scanner* self) {
 				gchar* _tmp53_ = NULL;
 				ScanDevice* _tmp54_ = NULL;
 				ScanDevice* _tmp55_ = NULL;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp8_) {
 #line 5011 "scanner.c"
 					gint _tmp9_ = 0;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = i;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp9_ + 1;
 #line 5017 "scanner.c"
 				}
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = FALSE;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp10_ = device_list;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp10__length1 = device_list_length1;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp11_ = i;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp12_ = _tmp10_[_tmp11_];
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!(_tmp12_ != NULL)) {
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 5033 "scanner.c"
 				}
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13_ = device_list;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13__length1 = device_list_length1;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp14_ = i;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp15_ = _tmp13_[_tmp14_];
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_ = _tmp15_->name;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp17_ = device_list;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp17__length1 = device_list_length1;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp18_ = i;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp19_ = _tmp17_[_tmp18_];
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp20_ = _tmp19_->vendor;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp21_ = device_list;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp21__length1 = device_list_length1;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22_ = i;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp23_ = _tmp21_[_tmp22_];
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp24_ = _tmp23_->model;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp25_ = device_list;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp25__length1 = device_list_length1;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp26_ = i;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp27_ = _tmp25_[_tmp26_];
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp28_ = _tmp27_->type;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				g_debug ("scanner.vala:350: Device: name=\"%s\" vendor=\"%s\" model=\"%s\" type=" \
 "\"%s\"", _tmp16_, _tmp20_, _tmp24_, _tmp28_);
-#line 353 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp29_ = scan_device_new ();
-#line 353 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scan_device = _tmp29_;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp30_ = scan_device;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp31_ = device_list;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp31__length1 = device_list_length1;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32_ = i;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp33_ = _tmp31_[_tmp32_];
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp34_ = _tmp33_->name;
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp35_ = g_strdup (_tmp34_);
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp30_->name);
-#line 354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp30_->name = _tmp35_;
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp36_ = device_list;
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp36__length1 = device_list_length1;
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp37_ = i;
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp38_ = _tmp36_[_tmp37_];
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp39_ = _tmp38_->vendor;
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp40_ = g_strdup (_tmp39_);
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				vendor = _tmp40_;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp41_ = vendor;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (g_strcmp0 (_tmp41_, "Hewlett-Packard") == 0) {
 #line 5117 "scanner.c"
 					gchar* _tmp42_ = NULL;
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp42_ = g_strdup ("HP");
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_g_free0 (vendor);
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					vendor = _tmp42_;
 #line 5125 "scanner.c"
 				}
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp43_ = scan_device;
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp44_ = vendor;
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp45_ = device_list;
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp45__length1 = device_list_length1;
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp46_ = i;
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp47_ = _tmp45_[_tmp46_];
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp48_ = _tmp47_->model;
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp49_ = g_strdup_printf ("%s %s", _tmp44_, _tmp48_);
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp43_->label);
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp43_->label = _tmp49_;
-#line 363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp50_ = scan_device;
-#line 363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp51_ = _tmp50_->label;
-#line 363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp52_ = string_replace (_tmp51_, "_", " ");
-#line 363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp53_ = _tmp52_;
-#line 363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp53_);
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp54_ = scan_device;
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp55_ = _scan_device_ref0 (_tmp54_);
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				devices = g_list_append (devices, _tmp55_);
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (vendor);
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_scan_device_unref0 (scan_device);
 #line 5167 "scanner.c"
 			}
 		}
 	}
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = g_list_sort (devices, _scanner_compare_devices_gcompare_func);
-#line 371 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->need_redetect = FALSE;
-#line 372 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
-#line 374 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp56_ = devices;
-#line 374 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp56_ != NULL) {
 #line 5181 "scanner.c"
 		ScanDevice* device = NULL;
@@ -5186,47 +5186,47 @@ static void scanner_do_redetect (Scanner* self) {
 		ScanDevice* _tmp60_ = NULL;
 		const gchar* _tmp61_ = NULL;
 		gchar* _tmp62_ = NULL;
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_ = devices;
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp58_ = g_list_nth_data (_tmp57_, (guint) 0);
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_ = _scan_device_ref0 ((ScanDevice*) _tmp58_);
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		device = _tmp59_;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp60_ = device;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp61_ = _tmp60_->name;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp62_ = g_strdup (_tmp61_);
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (self->priv->default_device);
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->default_device = _tmp62_;
-#line 374 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_device_unref0 (device);
 #line 5209 "scanner.c"
 	} else {
-#line 380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (self->priv->default_device);
-#line 380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->default_device = NULL;
 #line 5215 "scanner.c"
 	}
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp63_ = devices;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = NULL;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp64_ = notify_update_devices_new (_tmp63_);
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp65_ = _tmp64_;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp65_);
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp65_);
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (devices);
 #line 5231 "scanner.c"
 }
@@ -5242,27 +5242,27 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 	gboolean _tmp4_ = FALSE;
 	SANE_Option_Descriptor* _tmp5_ = NULL;
 	SANE_Constraint_Type _tmp6_ = 0;
-#line 385 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 385 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, 0);
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = value;
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	v = _tmp0_;
-#line 389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = option;
-#line 389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _tmp1_->type;
-#line 389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = value;
-#line 389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp2_ == SANE_TYPE_INT, _tmp3_);
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = option;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = _tmp5_->constraint_type;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ == SANE_CONSTRAINT_RANGE) {
 #line 5267 "scanner.c"
 		SANE_Option_Descriptor* _tmp7_ = NULL;
@@ -5271,27 +5271,27 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 		SANE_Option_Descriptor* _tmp10_ = NULL;
 		SANE_Range* _tmp11_ = NULL;
 		SANE_Word _tmp12_ = {0};
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = option;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = _tmp7_->constraint.range;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = _tmp8_->max;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = option;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = _tmp10_->constraint.range;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = _tmp11_->min;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = _tmp9_ != _tmp12_;
 #line 5288 "scanner.c"
 	} else {
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = FALSE;
 #line 5292 "scanner.c"
 	}
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_) {
 #line 5296 "scanner.c"
 		gint _tmp13_ = 0;
@@ -5320,74 +5320,74 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 		SANE_Option_Descriptor* _tmp36_ = NULL;
 		SANE_Range* _tmp37_ = NULL;
 		SANE_Word _tmp38_ = {0};
-#line 393 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = v;
-#line 393 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = source_min;
-#line 393 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		v = _tmp13_ - _tmp14_;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = v;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = option;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = _tmp16_->constraint.range;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp18_ = _tmp17_->max;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = option;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp20_ = _tmp19_->constraint.range;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp21_ = _tmp20_->min;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		v = _tmp15_ * ((gint) (_tmp18_ - _tmp21_));
-#line 395 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp22_ = v;
-#line 395 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp23_ = source_max;
-#line 395 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp24_ = source_min;
-#line 395 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		v = _tmp22_ / (_tmp23_ - _tmp24_);
-#line 396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp25_ = v;
-#line 396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp26_ = option;
-#line 396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp27_ = _tmp26_->constraint.range;
-#line 396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp28_ = _tmp27_->min;
-#line 396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		v = _tmp25_ + ((gint) _tmp28_);
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp29_ = value;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp30_ = source_min;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp31_ = source_max;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp32_ = v;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp33_ = option;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = _tmp33_->constraint.range;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp35_ = _tmp34_->min;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp36_ = option;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp37_ = _tmp36_->constraint.range;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp38_ = _tmp37_->max;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:397: scale_int: scaling %d [min: %d, max: %d] to %d [min:" \
 " %d, max: %d]", _tmp29_, _tmp30_, _tmp31_, _tmp32_, (gint) _tmp35_, (gint) _tmp38_);
 #line 5385 "scanner.c"
 	}
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = v;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 5391 "scanner.c"
 }
@@ -5407,68 +5407,68 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 	gchar* _tmp8_ = NULL;
 	SANE_Status _tmp9_ = 0;
 	SANE_Status _tmp14_ = 0;
-#line 404 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 404 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, FALSE);
-#line 407 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
-#line 407 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->cap;
-#line 407 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if ((_tmp1_ & SANE_CAP_AUTOMATIC) == ((SANE_Int) 0)) {
-#line 408 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = FALSE;
-#line 408 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
 #line 5423 "scanner.c"
 	}
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = handle;
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = option_index;
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = sane_control_option (_tmp2_, _tmp3_, SANE_ACTION_SET_AUTO, NULL, NULL);
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp4_;
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = option_index;
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = status;
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = sane_status_to_string (_tmp6_);
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_;
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:411: sane_control_option (%d, SANE_ACTION_SET_AUTO) -> %s", (gint) _tmp5_, _tmp8_);
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp8_);
-#line 412 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = status;
-#line 412 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ != SANE_STATUS_GOOD) {
 #line 5449 "scanner.c"
 		SANE_Option_Descriptor* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		SANE_Status _tmp12_ = 0;
 		const gchar* _tmp13_ = NULL;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = option;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = _tmp10_->name;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = status;
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = sane_strstatus (_tmp12_);
-#line 413 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:413: Error setting default option %s: %s", _tmp11_, _tmp13_);
 #line 5464 "scanner.c"
 	}
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = status;
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp14_ == SANE_STATUS_GOOD;
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 5472 "scanner.c"
 }
@@ -5493,72 +5493,72 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	SANE_Status _tmp12_ = 0;
 	gchar* _tmp13_ = NULL;
 	gchar* _tmp14_ = NULL;
-#line 418 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 418 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
-#line 420 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
-#line 420 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->type;
-#line 420 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (_tmp1_ == SANE_TYPE_BOOL);
-#line 422 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = value;
-#line 422 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 422 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	v = (SANE_Bool) _tmp2_;
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = handle;
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = option_index;
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = sane_control_option (_tmp3_, _tmp4_, SANE_ACTION_SET_VALUE, &v, NULL);
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp5_;
-#line 424 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = v;
-#line 424 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = (gboolean) _tmp6_;
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = value;
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp8_) {
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = "SANE_TRUE";
 #line 5527 "scanner.c"
 	} else {
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = "SANE_FALSE";
 #line 5531 "scanner.c"
 	}
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = _vala_result;
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp10_) {
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = "SANE_TRUE";
 #line 5539 "scanner.c"
 	} else {
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = "SANE_FALSE";
 #line 5543 "scanner.c"
 	}
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = option_index;
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = status;
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = sane_status_to_string (_tmp12_);
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = _tmp13_;
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:425: sane_control_option (%d, SANE_ACTION_SET_VALUE, %s) " \
 "-> (%s, %s)", (gint) _tmp11_, _tmp7_, _tmp14_, _tmp9_);
-#line 425 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp14_);
-#line 418 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
-#line 418 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
 #line 5561 "scanner.c"
 	}
@@ -5583,25 +5583,25 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 	gchar* _tmp53_ = NULL;
 	SANE_Int _tmp54_ = {0};
 	SANE_Int _tmp55_ = {0};
-#line 428 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 428 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
-#line 430 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
-#line 430 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->type;
-#line 430 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (_tmp1_ == SANE_TYPE_INT);
-#line 432 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = value;
-#line 432 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	v = (SANE_Int) _tmp2_;
-#line 433 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = option;
-#line 433 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->constraint_type;
-#line 433 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_ == SANE_CONSTRAINT_RANGE) {
 #line 5604 "scanner.c"
 		SANE_Option_Descriptor* _tmp5_ = NULL;
@@ -5615,107 +5615,107 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		SANE_Option_Descriptor* _tmp20_ = NULL;
 		SANE_Range* _tmp21_ = NULL;
 		SANE_Word _tmp22_ = {0};
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = option;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->constraint.range;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = _tmp6_->quant;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp7_ != ((SANE_Word) 0)) {
 #line 5624 "scanner.c"
 			SANE_Int _tmp8_ = {0};
 			SANE_Option_Descriptor* _tmp9_ = NULL;
 			SANE_Range* _tmp10_ = NULL;
 			SANE_Word _tmp11_ = {0};
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp8_ = v;
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp9_ = option;
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp10_ = _tmp9_->constraint.range;
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp11_ = _tmp10_->quant;
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp8_ * _tmp11_;
 #line 5639 "scanner.c"
 		}
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = v;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = option;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = _tmp13_->constraint.range;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = _tmp14_->min;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp12_ < ((SANE_Int) _tmp15_)) {
 #line 5651 "scanner.c"
 			SANE_Option_Descriptor* _tmp16_ = NULL;
 			SANE_Range* _tmp17_ = NULL;
 			SANE_Word _tmp18_ = {0};
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp16_ = option;
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = _tmp16_->constraint.range;
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = _tmp17_->min;
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp18_;
 #line 5663 "scanner.c"
 		}
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = v;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp20_ = option;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp21_ = _tmp20_->constraint.range;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp22_ = _tmp21_->max;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp19_ > ((SANE_Int) _tmp22_)) {
 #line 5675 "scanner.c"
 			SANE_Option_Descriptor* _tmp23_ = NULL;
 			SANE_Range* _tmp24_ = NULL;
 			SANE_Word _tmp25_ = {0};
-#line 440 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = option;
-#line 440 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp24_ = _tmp23_->constraint.range;
-#line 440 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = _tmp24_->max;
-#line 440 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp25_;
 #line 5687 "scanner.c"
 		}
 	} else {
 		SANE_Option_Descriptor* _tmp26_ = NULL;
 		SANE_Constraint_Type _tmp27_ = 0;
-#line 442 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp26_ = option;
-#line 442 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp27_ = _tmp26_->constraint_type;
-#line 442 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp27_ == SANE_CONSTRAINT_WORD_LIST) {
 #line 5698 "scanner.c"
 			gint distance = 0;
 			gint nearest = 0;
 			gint _tmp46_ = 0;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			distance = G_MAXINT;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0;
 #line 5706 "scanner.c"
 			{
 				gint i = 0;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
 #line 5711 "scanner.c"
 				{
 					gboolean _tmp28_ = FALSE;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp28_ = TRUE;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
 #line 5718 "scanner.c"
 						gint _tmp30_ = 0;
@@ -5736,117 +5736,117 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 						gint _tmp41_ = 0;
 						gint _tmp42_ = 0;
 						gint _tmp43_ = 0;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp28_) {
 #line 5739 "scanner.c"
 							gint _tmp29_ = 0;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp29_ = i;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp29_ + 1;
 #line 5745 "scanner.c"
 						}
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp28_ = FALSE;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp30_ = i;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp31_ = option;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp32_ = _tmp31_->constraint.word_list;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp32__length1 = -1;
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp33_ = _tmp32_[0];
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(((SANE_Word) _tmp30_) < _tmp33_)) {
-#line 447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
 #line 5763 "scanner.c"
 						}
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp34_ = option;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp35_ = _tmp34_->constraint.word_list;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp35__length1 = -1;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp36_ = i;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp37_ = _tmp35_[_tmp36_ + 1];
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						x = (gint) _tmp37_;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp38_ = x;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp39_ = v;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						d = (gint) (_tmp38_ - _tmp39_);
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp40_ = d;
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp41_ = abs (_tmp40_);
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						d = _tmp41_;
-#line 452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp42_ = d;
-#line 452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp43_ = distance;
-#line 452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp42_ < _tmp43_) {
 #line 5795 "scanner.c"
 							gint _tmp44_ = 0;
 							gint _tmp45_ = 0;
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp44_ = d;
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							distance = _tmp44_;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp45_ = x;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							nearest = _tmp45_;
 #line 5806 "scanner.c"
 						}
 					}
 				}
 			}
-#line 458 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp46_ = nearest;
-#line 458 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp46_;
 #line 5815 "scanner.c"
 		}
 	}
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp47_ = handle;
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp48_ = option_index;
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp49_ = sane_control_option (_tmp47_, _tmp48_, SANE_ACTION_SET_VALUE, &v, NULL);
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp49_;
-#line 462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp50_ = option_index;
-#line 462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp51_ = value;
-#line 462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp52_ = sane_status_to_string (status);
-#line 462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp53_ = _tmp52_;
-#line 462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp54_ = v;
-#line 462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:462: sane_control_option (%d, SANE_ACTION_SET_VALUE, %d) " \
 "-> (%s, %d)", (gint) _tmp50_, _tmp51_, _tmp53_, (gint) _tmp54_);
-#line 462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp53_);
-#line 463 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp55_ = v;
-#line 463 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = (gint) _tmp55_;
-#line 428 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
-#line 428 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
 #line 5848 "scanner.c"
 	}
@@ -5874,25 +5874,25 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 	gchar* _tmp49_ = NULL;
 	gdouble _tmp50_ = 0.0;
 	gdouble _tmp51_ = 0.0;
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
-#line 468 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = value;
-#line 468 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	v = _tmp0_;
-#line 471 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = option;
-#line 471 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _tmp1_->type;
-#line 471 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (_tmp2_ == SANE_TYPE_FIXED);
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = option;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->constraint_type;
-#line 473 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_ == SANE_CONSTRAINT_RANGE) {
 #line 5894 "scanner.c"
 		gdouble min = 0.0;
@@ -5909,82 +5909,82 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 		gdouble _tmp14_ = 0.0;
 		gdouble _tmp16_ = 0.0;
 		gdouble _tmp17_ = 0.0;
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = option;
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->constraint.range;
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = _tmp6_->min;
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = SANE_UNFIX ((SANE_Fixed) _tmp7_);
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		min = _tmp8_;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = option;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = _tmp9_->constraint.range;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = _tmp10_->max;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = SANE_UNFIX ((SANE_Fixed) _tmp11_);
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		max = _tmp12_;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = v;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = min;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp13_ < _tmp14_) {
 #line 5935 "scanner.c"
 			gdouble _tmp15_ = 0.0;
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = min;
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp15_;
 #line 5941 "scanner.c"
 		}
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = v;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = max;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp16_ > _tmp17_) {
 #line 5949 "scanner.c"
 			gdouble _tmp18_ = 0.0;
-#line 481 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = max;
-#line 481 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp18_;
 #line 5955 "scanner.c"
 		}
 	} else {
 		SANE_Option_Descriptor* _tmp19_ = NULL;
 		SANE_Constraint_Type _tmp20_ = 0;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = option;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp20_ = _tmp19_->constraint_type;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ == SANE_CONSTRAINT_WORD_LIST) {
 #line 5966 "scanner.c"
 			gdouble distance = 0.0;
 			gdouble nearest = 0.0;
 			gdouble _tmp40_ = 0.0;
-#line 485 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			distance = DBL_MAX;
-#line 485 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0.0;
 #line 5974 "scanner.c"
 			{
 				gint i = 0;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
 #line 5979 "scanner.c"
 				{
 					gboolean _tmp21_ = FALSE;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp21_ = TRUE;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
 #line 5986 "scanner.c"
 						gint _tmp23_ = 0;
@@ -6003,123 +6003,123 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 						gdouble _tmp33_ = 0.0;
 						gdouble _tmp34_ = 0.0;
 						gdouble _tmp35_ = 0.0;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp21_) {
 #line 6005 "scanner.c"
 							gint _tmp22_ = 0;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp22_ = i;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp22_ + 1;
 #line 6011 "scanner.c"
 						}
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp21_ = FALSE;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp23_ = i;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp24_ = option;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp25_ = _tmp24_->constraint.word_list;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp25__length1 = -1;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp26_ = _tmp25_[0];
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(((SANE_Word) _tmp23_) < _tmp26_)) {
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
 #line 6029 "scanner.c"
 						}
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp27_ = option;
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp28_ = _tmp27_->constraint.word_list;
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp28__length1 = -1;
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp29_ = i;
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp30_ = _tmp28_[_tmp29_ + 1];
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp31_ = SANE_UNFIX ((SANE_Fixed) _tmp30_);
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						x = _tmp31_;
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp32_ = x;
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp33_ = v;
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp34_ = fabs (_tmp32_ - _tmp33_);
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp35_ = distance;
-#line 491 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp34_ < _tmp35_) {
 #line 6055 "scanner.c"
 							gdouble _tmp36_ = 0.0;
 							gdouble _tmp37_ = 0.0;
 							gdouble _tmp38_ = 0.0;
 							gdouble _tmp39_ = 0.0;
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp36_ = x;
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp37_ = v;
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp38_ = fabs (_tmp36_ - _tmp37_);
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							distance = _tmp38_;
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp39_ = x;
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							nearest = _tmp39_;
 #line 6072 "scanner.c"
 						}
 					}
 				}
 			}
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp40_ = nearest;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp40_;
 #line 6081 "scanner.c"
 		}
 	}
-#line 500 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = v;
-#line 500 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = SANE_FIX (_tmp41_);
-#line 500 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	v_fixed = _tmp42_;
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = handle;
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = option_index;
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp45_ = sane_control_option (_tmp43_, _tmp44_, SANE_ACTION_SET_VALUE, &v_fixed, NULL);
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp45_;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp46_ = option_index;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp47_ = value;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp48_ = sane_status_to_string (status);
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp49_ = _tmp48_;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp50_ = SANE_UNFIX (v_fixed);
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:502: sane_control_option (%d, SANE_ACTION_SET_VALUE, %f) " \
 "-> (%s, %f)", (gint) _tmp46_, _tmp47_, _tmp49_, _tmp50_);
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp49_);
-#line 504 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp51_ = SANE_UNFIX (v_fixed);
-#line 504 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp51_;
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
 #line 6120 "scanner.c"
 	}
@@ -6130,15 +6130,15 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 	gdouble _vala_result = 0.0;
 	SANE_Option_Descriptor* _tmp0_ = NULL;
 	SANE_Value_Type _tmp1_ = 0;
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
-#line 509 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
-#line 509 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->type;
-#line 509 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SANE_TYPE_FIXED) {
 #line 6139 "scanner.c"
 		SANE_Handle _tmp2_ = {0};
@@ -6146,27 +6146,27 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 		SANE_Int _tmp4_ = {0};
 		gdouble _tmp5_ = 0.0;
 		gdouble _tmp6_ = 0.0;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = handle;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = option;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = option_index;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = value;
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_set_fixed_option (self, _tmp2_, _tmp3_, _tmp4_, _tmp5_, &_tmp6_);
-#line 510 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_vala_result = _tmp6_;
 #line 6157 "scanner.c"
 	} else {
 		SANE_Option_Descriptor* _tmp7_ = NULL;
 		SANE_Value_Type _tmp8_ = 0;
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = option;
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = _tmp7_->type;
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp8_ == SANE_TYPE_INT) {
 #line 6167 "scanner.c"
 			gint r = 0;
@@ -6177,36 +6177,36 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 			gdouble _tmp13_ = 0.0;
 			gint _tmp14_ = 0;
 			gint _tmp15_ = 0;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp9_ = handle;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp10_ = option;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp11_ = option_index;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp12_ = value;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp13_ = round (_tmp12_);
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_set_int_option (self, _tmp9_, _tmp10_, _tmp11_, (gint) _tmp13_, &_tmp14_);
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			r = _tmp14_;
-#line 515 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = r;
-#line 515 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_vala_result = (gdouble) _tmp15_;
 #line 6194 "scanner.c"
 		} else {
-#line 519 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_vala_result = 0.0;
-#line 520 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:520: Unable to set unsupported option type");
 #line 6200 "scanner.c"
 		}
 	}
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
 #line 6207 "scanner.c"
 	}
@@ -6226,44 +6226,44 @@ static void scanner_set_option_to_max (Scanner* self, SANE_Handle handle, SANE_O
 	SANE_Status _tmp8_ = 0;
 	gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
-#line 524 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 524 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->constraint_type;
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ != SANE_CONSTRAINT_RANGE) {
-#line 527 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 6237 "scanner.c"
 	}
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = handle;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = option_index;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = option;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_->constraint.range;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = sane_control_option (_tmp2_, _tmp3_, SANE_ACTION_SET_VALUE, &_tmp5_->max, NULL);
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp6_;
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = option_index;
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = status;
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = sane_status_to_string (_tmp8_);
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = _tmp9_;
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:530: sane_control_option (%d, SANE_ACTION_SET_VALUE, opti" \
 "on.range.max) -> (%s)", (gint) _tmp7_, _tmp10_);
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp10_);
 #line 6263 "scanner.c"
 }
@@ -6318,44 +6318,44 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 	gchar* _tmp32_ = NULL;
 	gchar* _tmp33_ = NULL;
 	const gchar* _tmp34_ = NULL;
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, FALSE);
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (value != NULL, FALSE);
-#line 535 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = g_strdup ("");
-#line 535 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_vala_result);
-#line 535 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp0_;
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = option;
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _tmp1_->type;
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp2_ == SANE_TYPE_STRING, FALSE);
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = option;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->size;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = g_new0 (gchar, _tmp4_);
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = _tmp5_;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s_length1 = _tmp4_;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_s_size_ = s_length1;
-#line 540 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	i = 0;
 #line 6348 "scanner.c"
 	{
 		gboolean _tmp6_ = FALSE;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = TRUE;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		while (TRUE) {
 #line 6355 "scanner.c"
 			gboolean _tmp8_ = FALSE;
@@ -6369,131 +6369,131 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 			gint _tmp18_ = 0;
 			gchar _tmp19_ = '\0';
 			gchar _tmp20_ = '\0';
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp6_) {
 #line 6369 "scanner.c"
 				gint _tmp7_ = 0;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = i;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = _tmp7_ + 1;
 #line 6375 "scanner.c"
 			}
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = FALSE;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp9_ = i;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp10_ = option;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp11_ = _tmp10_->size;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (((SANE_Int) _tmp9_) < (_tmp11_ - 1)) {
 #line 6387 "scanner.c"
 				const gchar* _tmp12_ = NULL;
 				gint _tmp13_ = 0;
 				gchar _tmp14_ = '\0';
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp12_ = value;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13_ = i;
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp14_ = string_get (_tmp12_, (glong) _tmp13_);
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = _tmp14_ != '\0';
 #line 6399 "scanner.c"
 			} else {
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = FALSE;
 #line 6403 "scanner.c"
 			}
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp8_) {
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 6409 "scanner.c"
 			}
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = s;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15__length1 = s_length1;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp16_ = i;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = value;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = i;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp19_ = string_get (_tmp17_, (glong) _tmp18_);
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_[_tmp16_] = _tmp19_;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = _tmp15_[_tmp16_];
 #line 6427 "scanner.c"
 		}
 	}
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = s;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21__length1 = s_length1;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = i;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_[_tmp22_] = '\0';
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = _tmp21_[_tmp22_];
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = handle;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = option_index;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = s;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26__length1 = s_length1;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = sane_control_option (_tmp24_, _tmp25_, SANE_ACTION_SET_VALUE, _tmp26_, NULL);
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp27_;
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = s;
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28__length1 = s_length1;
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = g_strdup ((const gchar*) _tmp28_);
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_vala_result);
-#line 545 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp29_;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = option_index;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = value;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp32_ = sane_status_to_string (status);
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_ = _tmp32_;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = _vala_result;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:546: sane_control_option (%d, SANE_ACTION_SET_VALUE, \"%s" \
 "\") -> (%s, \"%s\")", (gint) _tmp30_, _tmp31_, _tmp33_, _tmp34_);
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp33_);
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = status == SANE_STATUS_GOOD;
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = (g_free (s), NULL);
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
 #line 6484 "scanner.c"
 	} else {
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
 #line 6488 "scanner.c"
 	}
-#line 548 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 6492 "scanner.c"
 }
@@ -6507,33 +6507,33 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 	SANE_Option_Descriptor* _tmp2_ = NULL;
 	SANE_Constraint_Type _tmp3_ = 0;
 	gchar* _tmp34_ = NULL;
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, FALSE);
-#line 553 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
-#line 553 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->type;
-#line 553 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp1_ == SANE_TYPE_STRING, FALSE);
-#line 554 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = option;
-#line 554 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->constraint_type;
-#line 554 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp3_ == SANE_CONSTRAINT_STRING_LIST, FALSE);
 #line 6520 "scanner.c"
 	{
 		gint i = 0;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
 #line 6525 "scanner.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = TRUE;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
 #line 6532 "scanner.c"
 				gchar** _tmp6_ = NULL;
@@ -6546,40 +6546,40 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 				gint _tmp23__length1 = 0;
 				gint _tmp24_ = 0;
 				const gchar* _tmp25_ = NULL;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp4_) {
 #line 6545 "scanner.c"
 					gint _tmp5_ = 0;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp5_ = i;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp5_ + 1;
 #line 6551 "scanner.c"
 				}
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp4_ = FALSE;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp6_ = values;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp6__length1 = values_length1;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = i;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = _tmp6_[_tmp7_];
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!(_tmp8_ != NULL)) {
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 6567 "scanner.c"
 				}
-#line 558 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				j = 0;
 #line 6571 "scanner.c"
 				{
 					gboolean _tmp9_ = FALSE;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = TRUE;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
 #line 6578 "scanner.c"
 						SANE_Option_Descriptor* _tmp11_ = NULL;
@@ -6596,71 +6596,71 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 						gint _tmp19__length1 = 0;
 						gint _tmp20_ = 0;
 						const gchar* _tmp21_ = NULL;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp9_) {
 #line 6595 "scanner.c"
 							gint _tmp10_ = 0;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp10_ = j;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							j = _tmp10_ + 1;
 #line 6601 "scanner.c"
 						}
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp9_ = FALSE;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp11_ = option;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp12_ = _tmp11_->constraint.string_list;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp12__length1 = -1;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp13_ = j;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp14_ = _tmp12_[_tmp13_];
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(_tmp14_ != NULL)) {
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
 #line 6619 "scanner.c"
 						}
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp15_ = values;
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp15__length1 = values_length1;
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp16_ = i;
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp17_ = _tmp15_[_tmp16_];
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp18_ = option;
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp19_ = _tmp18_->constraint.string_list;
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp19__length1 = -1;
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp20_ = j;
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp21_ = _tmp19_[_tmp20_];
-#line 561 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (g_strcmp0 (_tmp17_, _tmp21_) == 0) {
-#line 562 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
 #line 6643 "scanner.c"
 						}
 					}
 				}
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22_ = option;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp23_ = _tmp22_->constraint.string_list;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp23__length1 = -1;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp24_ = j;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp25_ = _tmp23_[_tmp24_];
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp25_ != NULL) {
 #line 6659 "scanner.c"
 					SANE_Handle _tmp26_ = {0};
@@ -6672,64 +6672,64 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 					const gchar* _tmp31_ = NULL;
 					gchar* _tmp32_ = NULL;
 					gboolean _tmp33_ = FALSE;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp26_ = handle;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp27_ = option;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp28_ = option_index;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp29_ = values;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp29__length1 = values_length1;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp30_ = i;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp31_ = _tmp29_[_tmp30_];
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp33_ = scanner_set_string_option (self, _tmp26_, _tmp27_, _tmp28_, _tmp31_, &_tmp32_);
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_g_free0 (_vala_result);
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_vala_result = _tmp32_;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					result = _tmp33_;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (_result_) {
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						*_result_ = _vala_result;
 #line 6695 "scanner.c"
 					} else {
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (_vala_result);
 #line 6699 "scanner.c"
 					}
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
 #line 6703 "scanner.c"
 				}
 			}
 		}
 	}
-#line 569 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = g_strdup ("");
-#line 569 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_vala_result);
-#line 569 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_result = _tmp34_;
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = FALSE;
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
 #line 6720 "scanner.c"
 	} else {
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
 #line 6724 "scanner.c"
 	}
-#line 570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 6728 "scanner.c"
 }
@@ -6762,21 +6762,21 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	const gchar* _tmp212_ = NULL;
 	SANE_Option_Descriptor* _tmp213_ = NULL;
 	const gchar* _tmp214_ = NULL;
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (option != NULL);
-#line 575 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = index;
-#line 575 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = g_strdup_printf ("Option %d:", (gint) _tmp0_);
-#line 575 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = _tmp1_;
-#line 577 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = option;
-#line 577 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_->name;
-#line 577 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp3_, "") != 0) {
 #line 6775 "scanner.c"
 		const gchar* _tmp4_ = NULL;
@@ -6785,31 +6785,31 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = s;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = option;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = _tmp5_->name;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = g_strdup_printf (" name='%s'", _tmp6_);
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = _tmp7_;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = g_strconcat (_tmp4_, _tmp8_, NULL);
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (s);
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		s = _tmp9_;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp8_);
 #line 6800 "scanner.c"
 	}
-#line 580 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = option;
-#line 580 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = _tmp10_->title;
-#line 580 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp11_, "") != 0) {
 #line 6808 "scanner.c"
 		const gchar* _tmp12_ = NULL;
@@ -6818,137 +6818,137 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = s;
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = option;
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = _tmp13_->title;
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = g_strdup_printf (" title='%s'", _tmp14_);
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = _tmp15_;
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = g_strconcat (_tmp12_, _tmp16_, NULL);
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (s);
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		s = _tmp17_;
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp16_);
 #line 6833 "scanner.c"
 	}
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = option;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = _tmp18_->type;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp19_) {
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BOOL:
 #line 6843 "scanner.c"
 		{
 			const gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
-#line 586 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = s;
-#line 586 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = g_strconcat (_tmp20_, " type=bool", NULL);
-#line 586 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 586 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp21_;
-#line 587 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 6857 "scanner.c"
 		}
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_INT:
 #line 6861 "scanner.c"
 		{
 			const gchar* _tmp22_ = NULL;
 			gchar* _tmp23_ = NULL;
-#line 589 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = s;
-#line 589 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = g_strconcat (_tmp22_, " type=int", NULL);
-#line 589 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 589 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp23_;
-#line 590 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 6875 "scanner.c"
 		}
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_FIXED:
 #line 6879 "scanner.c"
 		{
 			const gchar* _tmp24_ = NULL;
 			gchar* _tmp25_ = NULL;
-#line 592 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp24_ = s;
-#line 592 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = g_strconcat (_tmp24_, " type=fixed", NULL);
-#line 592 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 592 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp25_;
-#line 593 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 6893 "scanner.c"
 		}
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_STRING:
 #line 6897 "scanner.c"
 		{
 			const gchar* _tmp26_ = NULL;
 			gchar* _tmp27_ = NULL;
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp26_ = s;
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp27_ = g_strconcat (_tmp26_, " type=string", NULL);
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 595 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 595 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp27_;
-#line 596 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 6911 "scanner.c"
 		}
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BUTTON:
 #line 6915 "scanner.c"
 		{
 			const gchar* _tmp28_ = NULL;
 			gchar* _tmp29_ = NULL;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = s;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_ = g_strconcat (_tmp28_, " type=button", NULL);
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp29_;
-#line 599 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 6929 "scanner.c"
 		}
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_GROUP:
 #line 6933 "scanner.c"
 		{
 			const gchar* _tmp30_ = NULL;
 			gchar* _tmp31_ = NULL;
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp30_ = s;
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp31_ = g_strconcat (_tmp30_, " type=group", NULL);
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 601 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp31_;
-#line 602 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 602 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 6947 "scanner.c"
 		}
@@ -6960,166 +6960,166 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			gchar* _tmp35_ = NULL;
 			gchar* _tmp36_ = NULL;
 			gchar* _tmp37_ = NULL;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp32_ = s;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp33_ = option;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp34_ = _tmp33_->type;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp35_ = g_strdup_printf (" type=%d", (gint) _tmp34_);
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp36_ = _tmp35_;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_ = g_strconcat (_tmp32_, _tmp36_, NULL);
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp37_;
-#line 604 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp36_);
-#line 605 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 6977 "scanner.c"
 		}
 	}
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = s;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = option;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_ = _tmp39_->size;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = g_strdup_printf (" size=%d", (gint) _tmp40_);
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = _tmp41_;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = g_strconcat (_tmp38_, _tmp42_, NULL);
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (s);
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	s = _tmp43_;
-#line 608 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp42_);
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = option;
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp45_ = _tmp44_->unit;
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp45_) {
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_NONE:
 #line 7006 "scanner.c"
 		{
-#line 613 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7010 "scanner.c"
 		}
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PIXEL:
 #line 7014 "scanner.c"
 		{
 			const gchar* _tmp46_ = NULL;
 			gchar* _tmp47_ = NULL;
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp46_ = s;
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp47_ = g_strconcat (_tmp46_, " unit=pixels", NULL);
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp47_;
-#line 616 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7028 "scanner.c"
 		}
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_BIT:
 #line 7032 "scanner.c"
 		{
 			const gchar* _tmp48_ = NULL;
 			gchar* _tmp49_ = NULL;
-#line 618 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp48_ = s;
-#line 618 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp49_ = g_strconcat (_tmp48_, " unit=bits", NULL);
-#line 618 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 618 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp49_;
-#line 619 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7046 "scanner.c"
 		}
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MM:
 #line 7050 "scanner.c"
 		{
 			const gchar* _tmp50_ = NULL;
 			gchar* _tmp51_ = NULL;
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp50_ = s;
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_ = g_strconcat (_tmp50_, " unit=mm", NULL);
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 621 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp51_;
-#line 622 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7064 "scanner.c"
 		}
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_DPI:
 #line 7068 "scanner.c"
 		{
 			const gchar* _tmp52_ = NULL;
 			gchar* _tmp53_ = NULL;
-#line 624 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp52_ = s;
-#line 624 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp53_ = g_strconcat (_tmp52_, " unit=dpi", NULL);
-#line 624 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 624 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp53_;
-#line 625 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7082 "scanner.c"
 		}
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PERCENT:
 #line 7086 "scanner.c"
 		{
 			const gchar* _tmp54_ = NULL;
 			gchar* _tmp55_ = NULL;
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_ = s;
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp55_ = g_strconcat (_tmp54_, " unit=percent", NULL);
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp55_;
-#line 628 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7100 "scanner.c"
 		}
-#line 610 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MICROSECOND:
 #line 7104 "scanner.c"
 		{
 			const gchar* _tmp56_ = NULL;
 			gchar* _tmp57_ = NULL;
-#line 630 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp56_ = s;
-#line 630 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp57_ = g_strconcat (_tmp56_, " unit=microseconds", NULL);
-#line 630 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 630 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp57_;
-#line 631 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7118 "scanner.c"
 		}
@@ -7131,46 +7131,46 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			gchar* _tmp61_ = NULL;
 			gchar* _tmp62_ = NULL;
 			gchar* _tmp63_ = NULL;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp58_ = s;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp59_ = option;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp60_ = _tmp59_->unit;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp61_ = g_strdup_printf (" unit=%d", (gint) _tmp60_);
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp62_ = _tmp61_;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp63_ = g_strconcat (_tmp58_, _tmp62_, NULL);
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp63_;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp62_);
-#line 634 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7148 "scanner.c"
 		}
 	}
-#line 637 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp64_ = option;
-#line 637 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp65_ = _tmp64_->constraint_type;
-#line 637 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp65_) {
-#line 637 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_RANGE:
 #line 7159 "scanner.c"
 		{
 			SANE_Option_Descriptor* _tmp66_ = NULL;
 			SANE_Value_Type _tmp67_ = 0;
-#line 640 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp66_ = option;
-#line 640 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp67_ = _tmp66_->type;
-#line 640 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp67_ == SANE_TYPE_FIXED) {
 #line 7169 "scanner.c"
 				const gchar* _tmp68_ = NULL;
@@ -7188,41 +7188,41 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				gchar* _tmp80_ = NULL;
 				gchar* _tmp81_ = NULL;
 				gchar* _tmp82_ = NULL;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp68_ = s;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp69_ = option;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp70_ = _tmp69_->constraint.range;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp71_ = _tmp70_->min;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp72_ = SANE_UNFIX ((SANE_Fixed) _tmp71_);
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp73_ = option;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp74_ = _tmp73_->constraint.range;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp75_ = _tmp74_->max;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp76_ = SANE_UNFIX ((SANE_Fixed) _tmp75_);
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp77_ = option;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp78_ = _tmp77_->constraint.range;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp79_ = _tmp78_->quant;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp80_ = g_strdup_printf (" min=%f, max=%f, quant=%d", _tmp72_, _tmp76_, (gint) _tmp79_);
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp81_ = _tmp80_;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp82_ = g_strconcat (_tmp68_, _tmp81_, NULL);
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp82_;
-#line 641 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp81_);
 #line 7221 "scanner.c"
 			} else {
@@ -7239,45 +7239,45 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				gchar* _tmp93_ = NULL;
 				gchar* _tmp94_ = NULL;
 				gchar* _tmp95_ = NULL;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp83_ = s;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp84_ = option;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp85_ = _tmp84_->constraint.range;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp86_ = _tmp85_->min;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp87_ = option;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp88_ = _tmp87_->constraint.range;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp89_ = _tmp88_->max;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp90_ = option;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp91_ = _tmp90_->constraint.range;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp92_ = _tmp91_->quant;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp93_ = g_strdup_printf (" min=%d, max=%d, quant=%d", (gint) _tmp86_, (gint) _tmp89_, (gint) _tmp92_);
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp94_ = _tmp93_;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp95_ = g_strconcat (_tmp83_, _tmp94_, NULL);
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp95_;
-#line 643 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp94_);
 #line 7268 "scanner.c"
 			}
-#line 644 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7272 "scanner.c"
 		}
-#line 637 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_WORD_LIST:
 #line 7276 "scanner.c"
 		{
@@ -7285,25 +7285,25 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			gchar* _tmp97_ = NULL;
 			const gchar* _tmp126_ = NULL;
 			gchar* _tmp127_ = NULL;
-#line 646 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp96_ = s;
-#line 646 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp97_ = g_strconcat (_tmp96_, " values=[", NULL);
-#line 646 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 646 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp97_;
 #line 7290 "scanner.c"
 			{
 				gint i = 0;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
 #line 7295 "scanner.c"
 				{
 					gboolean _tmp98_ = FALSE;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp98_ = TRUE;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
 #line 7302 "scanner.c"
 						gint _tmp100_ = 0;
@@ -7314,56 +7314,56 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						gint _tmp104_ = 0;
 						SANE_Option_Descriptor* _tmp107_ = NULL;
 						SANE_Value_Type _tmp108_ = 0;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp98_) {
 #line 7313 "scanner.c"
 							gint _tmp99_ = 0;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp99_ = i;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp99_ + 1;
 #line 7319 "scanner.c"
 						}
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp98_ = FALSE;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp100_ = i;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp101_ = option;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp102_ = _tmp101_->constraint.word_list;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp102__length1 = -1;
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp103_ = _tmp102_[0];
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(((SANE_Word) _tmp100_) < _tmp103_)) {
-#line 647 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
 #line 7337 "scanner.c"
 						}
-#line 649 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp104_ = i;
-#line 649 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp104_ != 0) {
 #line 7343 "scanner.c"
 							const gchar* _tmp105_ = NULL;
 							gchar* _tmp106_ = NULL;
-#line 650 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp105_ = s;
-#line 650 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp106_ = g_strconcat (_tmp105_, ", ", NULL);
-#line 650 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
-#line 650 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp106_;
 #line 7354 "scanner.c"
 						}
-#line 651 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp107_ = option;
-#line 651 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp108_ = _tmp107_->type;
-#line 651 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp108_ == SANE_TYPE_INT) {
 #line 7362 "scanner.c"
 							const gchar* _tmp109_ = NULL;
@@ -7375,29 +7375,29 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							gchar* _tmp114_ = NULL;
 							gchar* _tmp115_ = NULL;
 							gchar* _tmp116_ = NULL;
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp109_ = s;
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp110_ = option;
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp111_ = _tmp110_->constraint.word_list;
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp111__length1 = -1;
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp112_ = i;
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp113_ = _tmp111_[_tmp112_ + 1];
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp114_ = g_strdup_printf ("%d", (gint) _tmp113_);
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp115_ = _tmp114_;
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp116_ = g_strconcat (_tmp109_, _tmp115_, NULL);
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp116_;
-#line 652 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (_tmp115_);
 #line 7396 "scanner.c"
 						} else {
@@ -7411,50 +7411,50 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							gchar* _tmp123_ = NULL;
 							gchar* _tmp124_ = NULL;
 							gchar* _tmp125_ = NULL;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp117_ = s;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp118_ = option;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp119_ = _tmp118_->constraint.word_list;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp119__length1 = -1;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp120_ = i;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp121_ = _tmp119_[_tmp120_ + 1];
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp122_ = SANE_UNFIX ((SANE_Fixed) _tmp121_);
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp123_ = g_strdup_printf ("%f", _tmp122_);
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp124_ = _tmp123_;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp125_ = g_strconcat (_tmp117_, _tmp124_, NULL);
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp125_;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (_tmp124_);
 #line 7434 "scanner.c"
 						}
 					}
 				}
 			}
-#line 656 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp126_ = s;
-#line 656 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp127_ = g_strconcat (_tmp126_, "]", NULL);
-#line 656 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 656 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp127_;
-#line 657 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 657 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7449 "scanner.c"
 		}
-#line 637 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_STRING_LIST:
 #line 7453 "scanner.c"
 		{
@@ -7462,25 +7462,25 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			gchar* _tmp129_ = NULL;
 			const gchar* _tmp147_ = NULL;
 			gchar* _tmp148_ = NULL;
-#line 659 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp128_ = s;
-#line 659 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp129_ = g_strconcat (_tmp128_, " values=[", NULL);
-#line 659 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 659 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp129_;
 #line 7467 "scanner.c"
 			{
 				gint i = 0;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
 #line 7472 "scanner.c"
 				{
 					gboolean _tmp130_ = FALSE;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp130_ = TRUE;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
 #line 7479 "scanner.c"
 						SANE_Option_Descriptor* _tmp132_ = NULL;
@@ -7498,107 +7498,107 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						gchar* _tmp144_ = NULL;
 						gchar* _tmp145_ = NULL;
 						gchar* _tmp146_ = NULL;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp130_) {
 #line 7497 "scanner.c"
 							gint _tmp131_ = 0;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp131_ = i;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp131_ + 1;
 #line 7503 "scanner.c"
 						}
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp130_ = FALSE;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp132_ = option;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp133_ = _tmp132_->constraint.string_list;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp133__length1 = -1;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp134_ = i;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp135_ = _tmp133_[_tmp134_];
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(_tmp135_ != NULL)) {
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
 #line 7521 "scanner.c"
 						}
-#line 662 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp136_ = i;
-#line 662 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp136_ != 0) {
 #line 7527 "scanner.c"
 							const gchar* _tmp137_ = NULL;
 							gchar* _tmp138_ = NULL;
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp137_ = s;
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp138_ = g_strconcat (_tmp137_, ", ", NULL);
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp138_;
 #line 7538 "scanner.c"
 						}
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp139_ = s;
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp140_ = option;
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp141_ = _tmp140_->constraint.string_list;
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp141__length1 = -1;
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp142_ = i;
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp143_ = _tmp141_[_tmp142_];
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp144_ = g_strdup_printf ("\"%s\"", _tmp143_);
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp145_ = _tmp144_;
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp146_ = g_strconcat (_tmp139_, _tmp145_, NULL);
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (s);
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						s = _tmp146_;
-#line 664 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (_tmp145_);
 #line 7564 "scanner.c"
 					}
 				}
 			}
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp147_ = s;
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp148_ = g_strconcat (_tmp147_, "]", NULL);
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 666 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp148_;
-#line 667 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7578 "scanner.c"
 		}
 		default:
 		{
-#line 669 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 669 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 7584 "scanner.c"
 		}
 	}
-#line 672 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp149_ = option;
-#line 672 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp150_ = _tmp149_->cap;
-#line 672 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	cap = _tmp150_;
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp151_ = cap;
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp151_ != ((SANE_Int) 0)) {
 #line 7597 "scanner.c"
 		const gchar* _tmp152_ = NULL;
@@ -7611,297 +7611,297 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		SANE_Int _tmp189_ = {0};
 		SANE_Int _tmp196_ = {0};
 		SANE_Int _tmp203_ = {0};
-#line 675 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp152_ = s;
-#line 675 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp153_ = g_strconcat (_tmp152_, " cap=", NULL);
-#line 675 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (s);
-#line 675 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		s = _tmp153_;
-#line 676 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp154_ = cap;
-#line 676 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp154_ & SANE_CAP_SOFT_SELECT) != ((SANE_Int) 0)) {
 #line 7620 "scanner.c"
 			const gchar* _tmp155_ = NULL;
 			const gchar* _tmp158_ = NULL;
 			gchar* _tmp159_ = NULL;
 			SANE_Int _tmp160_ = {0};
-#line 678 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp155_ = s;
-#line 678 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp155_, "") != 0) {
 #line 7629 "scanner.c"
 				const gchar* _tmp156_ = NULL;
 				gchar* _tmp157_ = NULL;
-#line 679 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp156_ = s;
-#line 679 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp157_ = g_strconcat (_tmp156_, ",", NULL);
-#line 679 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 679 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp157_;
 #line 7640 "scanner.c"
 			}
-#line 680 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp158_ = s;
-#line 680 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp159_ = g_strconcat (_tmp158_, "soft-select", NULL);
-#line 680 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 680 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp159_;
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp160_ = cap;
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp160_ & (~SANE_CAP_SOFT_SELECT);
 #line 7654 "scanner.c"
 		}
-#line 683 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp161_ = cap;
-#line 683 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp161_ & SANE_CAP_HARD_SELECT) != ((SANE_Int) 0)) {
 #line 7660 "scanner.c"
 			const gchar* _tmp162_ = NULL;
 			const gchar* _tmp165_ = NULL;
 			gchar* _tmp166_ = NULL;
 			SANE_Int _tmp167_ = {0};
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp162_ = s;
-#line 685 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp162_, "") != 0) {
 #line 7669 "scanner.c"
 				const gchar* _tmp163_ = NULL;
 				gchar* _tmp164_ = NULL;
-#line 686 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp163_ = s;
-#line 686 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp164_ = g_strconcat (_tmp163_, ",", NULL);
-#line 686 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 686 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp164_;
 #line 7680 "scanner.c"
 			}
-#line 687 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp165_ = s;
-#line 687 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp166_ = g_strconcat (_tmp165_, "hard-select", NULL);
-#line 687 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 687 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp166_;
-#line 688 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp167_ = cap;
-#line 688 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp167_ & (~SANE_CAP_HARD_SELECT);
 #line 7694 "scanner.c"
 		}
-#line 690 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp168_ = cap;
-#line 690 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp168_ & SANE_CAP_SOFT_DETECT) != ((SANE_Int) 0)) {
 #line 7700 "scanner.c"
 			const gchar* _tmp169_ = NULL;
 			const gchar* _tmp172_ = NULL;
 			gchar* _tmp173_ = NULL;
 			SANE_Int _tmp174_ = {0};
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp169_ = s;
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp169_, "") != 0) {
 #line 7709 "scanner.c"
 				const gchar* _tmp170_ = NULL;
 				gchar* _tmp171_ = NULL;
-#line 693 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp170_ = s;
-#line 693 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp171_ = g_strconcat (_tmp170_, ",", NULL);
-#line 693 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 693 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp171_;
 #line 7720 "scanner.c"
 			}
-#line 694 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp172_ = s;
-#line 694 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp173_ = g_strconcat (_tmp172_, "soft-detect", NULL);
-#line 694 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 694 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp173_;
-#line 695 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp174_ = cap;
-#line 695 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp174_ & (~SANE_CAP_SOFT_DETECT);
 #line 7734 "scanner.c"
 		}
-#line 697 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp175_ = cap;
-#line 697 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp175_ & SANE_CAP_EMULATED) != ((SANE_Int) 0)) {
 #line 7740 "scanner.c"
 			const gchar* _tmp176_ = NULL;
 			const gchar* _tmp179_ = NULL;
 			gchar* _tmp180_ = NULL;
 			SANE_Int _tmp181_ = {0};
-#line 699 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp176_ = s;
-#line 699 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp176_, "") != 0) {
 #line 7749 "scanner.c"
 				const gchar* _tmp177_ = NULL;
 				gchar* _tmp178_ = NULL;
-#line 700 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp177_ = s;
-#line 700 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp178_ = g_strconcat (_tmp177_, ",", NULL);
-#line 700 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 700 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp178_;
 #line 7760 "scanner.c"
 			}
-#line 701 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp179_ = s;
-#line 701 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp180_ = g_strconcat (_tmp179_, "emulated", NULL);
-#line 701 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 701 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp180_;
-#line 702 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp181_ = cap;
-#line 702 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp181_ & (~SANE_CAP_EMULATED);
 #line 7774 "scanner.c"
 		}
-#line 704 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp182_ = cap;
-#line 704 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp182_ & SANE_CAP_AUTOMATIC) != ((SANE_Int) 0)) {
 #line 7780 "scanner.c"
 			const gchar* _tmp183_ = NULL;
 			const gchar* _tmp186_ = NULL;
 			gchar* _tmp187_ = NULL;
 			SANE_Int _tmp188_ = {0};
-#line 706 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp183_ = s;
-#line 706 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 706 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp183_, "") != 0) {
 #line 7789 "scanner.c"
 				const gchar* _tmp184_ = NULL;
 				gchar* _tmp185_ = NULL;
-#line 707 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp184_ = s;
-#line 707 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp185_ = g_strconcat (_tmp184_, ",", NULL);
-#line 707 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 707 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp185_;
 #line 7800 "scanner.c"
 			}
-#line 708 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp186_ = s;
-#line 708 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp187_ = g_strconcat (_tmp186_, "automatic", NULL);
-#line 708 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 708 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp187_;
-#line 709 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_ = cap;
-#line 709 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp188_ & (~SANE_CAP_AUTOMATIC);
 #line 7814 "scanner.c"
 		}
-#line 711 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp189_ = cap;
-#line 711 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp189_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
 #line 7820 "scanner.c"
 			const gchar* _tmp190_ = NULL;
 			const gchar* _tmp193_ = NULL;
 			gchar* _tmp194_ = NULL;
 			SANE_Int _tmp195_ = {0};
-#line 713 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp190_ = s;
-#line 713 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp190_, "") != 0) {
 #line 7829 "scanner.c"
 				const gchar* _tmp191_ = NULL;
 				gchar* _tmp192_ = NULL;
-#line 714 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp191_ = s;
-#line 714 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp192_ = g_strconcat (_tmp191_, ",", NULL);
-#line 714 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 714 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp192_;
 #line 7840 "scanner.c"
 			}
-#line 715 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp193_ = s;
-#line 715 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp194_ = g_strconcat (_tmp193_, "inactive", NULL);
-#line 715 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 715 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp194_;
-#line 716 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp195_ = cap;
-#line 716 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp195_ & (~SANE_CAP_INACTIVE);
 #line 7854 "scanner.c"
 		}
-#line 718 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp196_ = cap;
-#line 718 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp196_ & SANE_CAP_ADVANCED) != ((SANE_Int) 0)) {
 #line 7860 "scanner.c"
 			const gchar* _tmp197_ = NULL;
 			const gchar* _tmp200_ = NULL;
 			gchar* _tmp201_ = NULL;
 			SANE_Int _tmp202_ = {0};
-#line 720 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp197_ = s;
-#line 720 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp197_, "") != 0) {
 #line 7869 "scanner.c"
 				const gchar* _tmp198_ = NULL;
 				gchar* _tmp199_ = NULL;
-#line 721 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp198_ = s;
-#line 721 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp199_ = g_strconcat (_tmp198_, ",", NULL);
-#line 721 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 721 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp199_;
 #line 7880 "scanner.c"
 			}
-#line 722 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp200_ = s;
-#line 722 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp201_ = g_strconcat (_tmp200_, "advanced", NULL);
-#line 722 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 722 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp201_;
-#line 723 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp202_ = cap;
-#line 723 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp202_ & (~SANE_CAP_ADVANCED);
 #line 7894 "scanner.c"
 		}
-#line 726 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp203_ = cap;
-#line 726 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp203_ != ((SANE_Int) 0)) {
 #line 7900 "scanner.c"
 			const gchar* _tmp204_ = NULL;
@@ -7910,64 +7910,64 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			gchar* _tmp209_ = NULL;
 			gchar* _tmp210_ = NULL;
 			gchar* _tmp211_ = NULL;
-#line 728 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp204_ = s;
-#line 728 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp204_, "") != 0) {
 #line 7911 "scanner.c"
 				const gchar* _tmp205_ = NULL;
 				gchar* _tmp206_ = NULL;
-#line 729 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp205_ = s;
-#line 729 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp206_ = g_strconcat (_tmp205_, ",", NULL);
-#line 729 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
-#line 729 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp206_;
 #line 7922 "scanner.c"
 			}
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp207_ = s;
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp208_ = cap;
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp209_ = g_strdup_printf ("%x", (guint) ((gint) _tmp208_));
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp210_ = _tmp209_;
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp211_ = g_strconcat (_tmp207_, _tmp210_, NULL);
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp211_;
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp210_);
 #line 7940 "scanner.c"
 		}
 	}
-#line 734 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp212_ = s;
-#line 734 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:734: %s", _tmp212_);
-#line 736 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp213_ = option;
-#line 736 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp214_ = _tmp213_->desc;
-#line 736 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp214_ != NULL) {
 #line 7953 "scanner.c"
 		SANE_Option_Descriptor* _tmp215_ = NULL;
 		const gchar* _tmp216_ = NULL;
-#line 737 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp215_ = option;
-#line 737 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp216_ = _tmp215_->desc;
-#line 737 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:737:   Description: %s", _tmp216_);
 #line 7962 "scanner.c"
 	}
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (s);
 #line 7966 "scanner.c"
 }
@@ -7982,39 +7982,39 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 	Scanner* _tmp4_ = NULL;
 	GAsyncQueue* _tmp5_ = NULL;
 	gpointer _tmp6_ = NULL;
-#line 740 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (resource != NULL);
-#line 742 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = scanner_scanner_object;
-#line 742 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = resource;
-#line 742 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = notify_request_authorization_new (_tmp1_);
-#line 742 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_;
-#line 742 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (_tmp0_, (Notify*) _tmp3_);
-#line 742 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 742 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp3_);
-#line 744 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = scanner_scanner_object;
-#line 744 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_->priv->authorize_queue;
-#line 744 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = g_async_queue_pop (_tmp5_);
-#line 744 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials = (Credentials*) _tmp6_;
 #line 8001 "scanner.c"
 	{
 		gint i = 0;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
 #line 8006 "scanner.c"
 		{
 			gboolean _tmp7_ = FALSE;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = TRUE;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
 #line 8013 "scanner.c"
 				gboolean _tmp9_ = FALSE;
@@ -8030,66 +8030,66 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				gint _tmp20_ = 0;
 				gchar _tmp21_ = '\0';
 				gchar _tmp22_ = '\0';
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp7_) {
 #line 8029 "scanner.c"
 					gint _tmp8_ = 0;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp8_ = i;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp8_ + 1;
 #line 8035 "scanner.c"
 				}
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = FALSE;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp10_ = credentials;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp11_ = _tmp10_->username;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp12_ = i;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13_ = string_get (_tmp11_, (glong) _tmp12_);
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp13_ != '\0') {
 #line 8049 "scanner.c"
 					gint _tmp14_ = 0;
 					gint _tmp15_ = 0;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp14_ = i;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp15_ = SANE_MAX_USERNAME_LEN;
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = _tmp14_ < _tmp15_;
 #line 8058 "scanner.c"
 				} else {
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = FALSE;
 #line 8062 "scanner.c"
 				}
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp9_) {
-#line 745 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 8068 "scanner.c"
 				}
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_ = username;
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16__length1 = username_length1;
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp17_ = i;
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp18_ = credentials;
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp19_ = _tmp18_->username;
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp20_ = i;
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp21_ = string_get (_tmp19_, (glong) _tmp20_);
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_[_tmp17_] = _tmp21_;
-#line 746 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22_ = _tmp16_[_tmp17_];
 #line 8088 "scanner.c"
 			}
@@ -8097,14 +8097,14 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 	}
 	{
 		gint i = 0;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
 #line 8096 "scanner.c"
 		{
 			gboolean _tmp23_ = FALSE;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = TRUE;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
 #line 8103 "scanner.c"
 				gboolean _tmp25_ = FALSE;
@@ -8120,79 +8120,79 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				gint _tmp36_ = 0;
 				gchar _tmp37_ = '\0';
 				gchar _tmp38_ = '\0';
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp23_) {
 #line 8119 "scanner.c"
 					gint _tmp24_ = 0;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp24_ = i;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp24_ + 1;
 #line 8125 "scanner.c"
 				}
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp23_ = FALSE;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp26_ = credentials;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp27_ = _tmp26_->password;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp28_ = i;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp29_ = string_get (_tmp27_, (glong) _tmp28_);
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp29_ != '\0') {
 #line 8139 "scanner.c"
 					gint _tmp30_ = 0;
 					gint _tmp31_ = 0;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp30_ = i;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp31_ = SANE_MAX_USERNAME_LEN;
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp25_ = _tmp30_ < _tmp31_;
 #line 8148 "scanner.c"
 				} else {
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp25_ = FALSE;
 #line 8152 "scanner.c"
 				}
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp25_) {
-#line 747 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 8158 "scanner.c"
 				}
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32_ = password;
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32__length1 = password_length1;
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp33_ = i;
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp34_ = credentials;
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp35_ = _tmp34_->password;
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp36_ = i;
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp37_ = string_get (_tmp35_, (glong) _tmp36_);
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32_[_tmp33_] = _tmp37_;
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp38_ = _tmp32_[_tmp33_];
 #line 8178 "scanner.c"
 			}
 		}
 	}
-#line 740 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
 #line 8184 "scanner.c"
 }
 
 
 static gpointer _credentials_ref0 (gpointer self) {
-#line 756 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? credentials_ref (self) : NULL;
 #line 8191 "scanner.c"
 }
@@ -8207,39 +8207,39 @@ void scanner_authorize (Scanner* self, const gchar* username, const gchar* passw
 	gchar* _tmp4_ = NULL;
 	GAsyncQueue* _tmp5_ = NULL;
 	Credentials* _tmp6_ = NULL;
-#line 751 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 751 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (username != NULL);
-#line 751 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (password != NULL);
-#line 753 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = credentials_new ();
-#line 753 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 753 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials = _tmp0_;
-#line 754 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = username;
-#line 754 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 754 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (credentials->username);
-#line 754 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 754 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials->username = _tmp2_;
-#line 755 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = password;
-#line 755 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 755 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (credentials->password);
-#line 755 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials->password = _tmp4_;
-#line 756 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->authorize_queue;
-#line 756 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = _credentials_ref0 (credentials);
-#line 756 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp5_, _tmp6_);
-#line 751 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
 #line 8238 "scanner.c"
 }
@@ -8247,48 +8247,48 @@ void scanner_authorize (Scanner* self, const gchar* username, const gchar* passw
 
 static void scanner_close_device (Scanner* self) {
 	gboolean _tmp0_ = FALSE;
-#line 759 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 761 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->have_handle;
-#line 761 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
 #line 8250 "scanner.c"
 		SANE_Handle _tmp1_ = {0};
 		SANE_Handle _tmp2_ = {0};
-#line 763 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = self->priv->handle;
-#line 763 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 763 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		sane_cancel (_tmp1_);
-#line 764 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 764 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:764: sane_cancel ()");
-#line 766 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = self->priv->handle;
-#line 766 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		sane_close (_tmp2_);
-#line 767 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:767: sane_close ()");
-#line 768 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 768 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->have_handle = FALSE;
-#line 769 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_hash_table_unref0 (self->priv->options);
-#line 769 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 769 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->options = NULL;
 #line 8271 "scanner.c"
 	}
-#line 772 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 772 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = NULL;
-#line 772 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer_length1 = 0;
-#line 772 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->_buffer_size_ = self->priv->buffer_length1;
-#line 773 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_job_unref0_0 (self->priv->job_queue);
-#line 773 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_queue = NULL;
-#line 775 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 775 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
 #line 8287 "scanner.c"
 }
@@ -8299,39 +8299,39 @@ static void scanner_fail_scan (Scanner* self, gint error_code, const gchar* erro
 	const gchar* _tmp1_ = NULL;
 	NotifyScanFailed* _tmp2_ = NULL;
 	NotifyScanFailed* _tmp3_ = NULL;
-#line 778 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 778 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 778 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (error_string != NULL);
-#line 780 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 780 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_close_device (self);
-#line 781 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = error_code;
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = error_string;
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = notify_scan_failed_new (_tmp0_, _tmp1_);
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _tmp2_;
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp3_);
-#line 782 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp3_);
 #line 8316 "scanner.c"
 }
 
 
 static gpointer _request_ref0 (gpointer self) {
-#line 807 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? request_ref (self) : NULL;
 #line 8323 "scanner.c"
 }
 
 
 static gpointer _scan_job_ref0 (gpointer self) {
-#line 808 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_job_ref (self) : NULL;
 #line 8330 "scanner.c"
 }
@@ -8342,33 +8342,33 @@ static gboolean scanner_handle_requests (Scanner* self) {
 	gboolean _tmp0_ = FALSE;
 	ScanState _tmp1_ = 0;
 	gint request_count = 0;
-#line 785 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 788 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->state;
-#line 788 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SCAN_STATE_IDLE) {
 #line 8345 "scanner.c"
 		gboolean _tmp2_ = FALSE;
-#line 788 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = self->priv->need_redetect;
-#line 788 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
 #line 8351 "scanner.c"
 	} else {
-#line 788 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
 #line 8355 "scanner.c"
 	}
-#line 788 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 789 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_REDETECT;
 #line 8361 "scanner.c"
 	}
-#line 792 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_count = 0;
-#line 793 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
 #line 8367 "scanner.c"
 		Request* request = NULL;
@@ -8377,70 +8377,70 @@ static gboolean scanner_handle_requests (Scanner* self) {
 		ScanState _tmp5_ = 0;
 		gint _tmp11_ = 0;
 		Request* _tmp12_ = NULL;
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = self->priv->state;
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp5_ == SCAN_STATE_IDLE) {
 #line 8378 "scanner.c"
 			gint _tmp6_ = 0;
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = request_count;
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = _tmp6_ == 0;
 #line 8384 "scanner.c"
 		} else {
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = FALSE;
 #line 8388 "scanner.c"
 		}
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp4_) {
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = TRUE;
 #line 8394 "scanner.c"
 		} else {
 			GAsyncQueue* _tmp7_ = NULL;
 			gint _tmp8_ = 0;
-#line 797 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = self->priv->request_queue;
-#line 797 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp8_ = g_async_queue_length (_tmp7_);
-#line 797 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = _tmp8_ > 0;
 #line 8404 "scanner.c"
 		}
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp3_) {
 #line 8408 "scanner.c"
 			GAsyncQueue* _tmp9_ = NULL;
 			gpointer _tmp10_ = NULL;
-#line 798 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp9_ = self->priv->request_queue;
-#line 798 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp10_ = g_async_queue_pop (_tmp9_);
-#line 798 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (request);
-#line 798 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			request = (Request*) _tmp10_;
 #line 8419 "scanner.c"
 		} else {
-#line 800 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = TRUE;
-#line 800 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (request);
-#line 800 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 8427 "scanner.c"
 		}
-#line 802 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 802 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:802: Processing request");
-#line 803 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = request_count;
-#line 803 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 803 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_count = _tmp11_ + 1;
-#line 805 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = request;
-#line 805 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_REQUEST_START_SCAN)) {
 #line 8439 "scanner.c"
 			RequestStartScan* r = NULL;
@@ -8449,51 +8449,51 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			RequestStartScan* _tmp15_ = NULL;
 			ScanJob* _tmp16_ = NULL;
 			ScanJob* _tmp17_ = NULL;
-#line 807 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp13_ = request;
-#line 807 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp14_ = _request_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_REQUEST_START_SCAN, RequestStartScan));
-#line 807 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			r = _tmp14_;
-#line 808 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = r;
-#line 808 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp16_ = _tmp15_->job;
-#line 808 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = _scan_job_ref0 (_tmp16_);
-#line 808 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			self->priv->job_queue = g_list_append (self->priv->job_queue, _tmp17_);
-#line 805 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (r);
 #line 8462 "scanner.c"
 		} else {
 			Request* _tmp18_ = NULL;
-#line 810 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 810 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = request;
-#line 810 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 810 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_REQUEST_CANCEL)) {
-#line 812 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_fail_scan (self, (gint) SANE_STATUS_CANCELLED, "Scan cancelled - do not report this error");
 #line 8471 "scanner.c"
 			} else {
 				Request* _tmp19_ = NULL;
-#line 814 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 814 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp19_ = request;
-#line 814 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 814 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_REQUEST_QUIT)) {
-#line 816 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 816 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_close_device (self);
-#line 817 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					result = FALSE;
-#line 817 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_request_unref0 (request);
-#line 817 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
 #line 8486 "scanner.c"
 				}
 			}
 		}
-#line 793 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_request_unref0 (request);
 #line 8492 "scanner.c"
 	}
@@ -8501,7 +8501,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 
 
 static void _g_free0_ (gpointer var) {
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	var = (g_free (var), NULL);
 #line 8500 "scanner.c"
 }
@@ -8535,199 +8535,199 @@ static void scanner_do_open (Scanner* self) {
 	ScanJob* _tmp35_ = NULL;
 	const gchar* _tmp36_ = NULL;
 	gchar* _tmp37_ = NULL;
-#line 822 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 822 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 824 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 824 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 824 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 824 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 826 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 826 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->line_count = 0;
-#line 827 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 827 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->pass_number = 0;
-#line 828 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->page_number = 0;
-#line 829 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->notified_page = -1;
-#line 830 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 830 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->option_index = (SANE_Int) 0;
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = job;
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_->device;
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ == NULL) {
 #line 8558 "scanner.c"
 		const gchar* _tmp6_ = NULL;
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = self->priv->default_device;
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = _tmp6_ != NULL;
 #line 8564 "scanner.c"
 	} else {
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = FALSE;
 #line 8568 "scanner.c"
 	}
-#line 832 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp3_) {
 #line 8572 "scanner.c"
 		ScanJob* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 833 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = job;
-#line 833 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = self->priv->default_device;
-#line 833 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = g_strdup (_tmp8_);
-#line 833 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp7_->device);
-#line 833 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_->device = _tmp9_;
 #line 8586 "scanner.c"
 	}
-#line 835 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = job;
-#line 835 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = _tmp10_->device;
-#line 835 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp11_ == NULL) {
 #line 8594 "scanner.c"
 		const gchar* _tmp12_ = NULL;
-#line 837 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:837: No scan device available");
-#line 838 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = _ ("No scanners available.  Please connect a scanner.");
-#line 838 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, 0, _tmp12_);
-#line 841 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 841 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 8606 "scanner.c"
 	}
-#line 845 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = self->priv->have_handle;
-#line 845 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp13_) {
 #line 8612 "scanner.c"
 		const gchar* _tmp14_ = NULL;
 		ScanJob* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 		SANE_Handle _tmp17_ = {0};
-#line 847 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = self->priv->current_device;
-#line 847 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = job;
-#line 847 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = _tmp15_->device;
-#line 847 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (g_strcmp0 (_tmp14_, _tmp16_) == 0) {
-#line 849 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			self->priv->state = SCAN_STATE_GET_OPTION;
-#line 850 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_scan_job_unref0 (job);
-#line 850 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return;
 #line 8631 "scanner.c"
 		}
-#line 853 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = self->priv->handle;
-#line 853 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		sane_close (_tmp17_);
-#line 854 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 854 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:854: sane_close ()");
-#line 855 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->have_handle = FALSE;
 #line 8641 "scanner.c"
 	}
-#line 858 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
-#line 858 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->current_device = NULL;
-#line 860 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->have_handle = FALSE;
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = g_str_hash;
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = g_str_equal;
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = g_hash_table_new_full (_tmp18_, _tmp19_, _g_free0_, NULL);
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_hash_table_unref0 (self->priv->options);
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->options = _tmp20_;
-#line 862 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = job;
-#line 862 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = _tmp21_->device;
-#line 862 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = sane_open (_tmp22_, &_tmp23_);
-#line 862 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->handle = _tmp23_;
-#line 862 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp24_;
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = job;
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = _tmp25_->device;
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = status;
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = sane_status_to_string (_tmp27_);
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = _tmp28_;
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:863: sane_open (\"%s\") -> %s", _tmp26_, _tmp29_);
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp29_);
-#line 865 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = status;
-#line 865 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp30_ != SANE_STATUS_GOOD) {
 #line 8687 "scanner.c"
 		SANE_Status _tmp31_ = 0;
 		const gchar* _tmp32_ = NULL;
 		SANE_Status _tmp33_ = 0;
 		const gchar* _tmp34_ = NULL;
-#line 867 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp31_ = status;
-#line 867 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp32_ = sane_strstatus (_tmp31_);
-#line 867 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:867: Unable to get open device: %s", _tmp32_);
-#line 868 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp33_ = status;
-#line 868 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = _ ("Unable to connect to scanner");
-#line 868 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp33_, _tmp34_);
-#line 871 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 871 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 8708 "scanner.c"
 	}
-#line 873 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->have_handle = TRUE;
-#line 875 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = job;
-#line 875 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = _tmp35_->device;
-#line 875 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_ = g_strdup (_tmp36_);
-#line 875 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
-#line 875 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->current_device = _tmp37_;
-#line 876 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_GET_OPTION;
-#line 822 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 822 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
 #line 8726 "scanner.c"
 }
@@ -8760,39 +8760,39 @@ static void scanner_do_get_option (Scanner* self) {
 	const gchar* _tmp366_ = NULL;
 	gchar* _tmp367_ = NULL;
 	SANE_Int _tmp368_ = {0};
-#line 879 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 881 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 881 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 881 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 881 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 883 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = self->priv->handle;
-#line 883 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->option_index;
-#line 883 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = sane_get_option_descriptor (_tmp3_, _tmp4_);
-#line 883 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 883 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	option = _tmp5_;
-#line 884 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = self->priv->option_index;
-#line 884 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 884 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:884: sane_get_option_descriptor (%d)", (gint) _tmp6_);
-#line 885 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = self->priv->option_index;
-#line 885 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	index = _tmp7_;
-#line 886 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = self->priv->option_index;
-#line 886 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->option_index = _tmp8_ + 1;
-#line 889 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = option;
-#line 889 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ == NULL) {
 #line 8791 "scanner.c"
 		SANE_Handle _tmp10_ = {0};
@@ -8856,40 +8856,40 @@ static void scanner_do_get_option (Scanner* self) {
 		SANE_Option_Descriptor* _tmp308_ = NULL;
 		SANE_Option_Descriptor* _tmp309_ = NULL;
 		const gchar* _tmp320_ = NULL;
-#line 892 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = self->priv->handle;
-#line 892 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp11_ = SANE_NAME_SCAN_SOURCE;
-#line 892 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = scanner_get_option_by_name (self, _tmp10_, _tmp11_, &_tmp12_);
-#line 892 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp12_;
-#line 892 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp13_;
-#line 893 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = option;
-#line 893 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp14_ == NULL) {
 #line 8867 "scanner.c"
 			SANE_Handle _tmp15_ = {0};
 			gint _tmp16_ = 0;
 			SANE_Option_Descriptor* _tmp17_ = NULL;
-#line 895 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 895 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_debug ("scanner.vala:895: SCAN_SOURCE not available, trying alternative \"doc-" \
 "source\"");
-#line 896 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = self->priv->handle;
-#line 896 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp17_ = scanner_get_option_by_name (self, _tmp15_, "doc-source", &_tmp16_);
-#line 896 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp16_;
-#line 896 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp17_;
 #line 8881 "scanner.c"
 		}
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp18_ = option;
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp18_ != NULL) {
 #line 8887 "scanner.c"
 			gchar** flatbed_sources = NULL;
@@ -8945,163 +8945,163 @@ static void scanner_do_get_option (Scanner* self) {
 			gint _adf_duplex_sources_size_ = 0;
 			ScanJob* _tmp55_ = NULL;
 			ScanType _tmp56_ = 0;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp19_ = g_strdup ("Auto");
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = SANE_I18N ("Auto");
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = g_strdup (_tmp20_);
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = g_strdup ("Flatbed");
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = SANE_I18N ("Flatbed");
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp24_ = g_strdup (_tmp23_);
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = g_strdup ("FlatBed");
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp26_ = g_strdup ("Normal");
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp27_ = SANE_I18N ("Normal");
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = g_strdup (_tmp27_);
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_ = g_new0 (gchar*, 7 + 1);
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[0] = _tmp19_;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[1] = _tmp21_;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[2] = _tmp22_;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[3] = _tmp24_;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[4] = _tmp25_;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[5] = _tmp26_;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp29_[6] = _tmp28_;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources = _tmp29_;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources_length1 = 7;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_flatbed_sources_size_ = flatbed_sources_length1;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp30_ = g_strdup ("Automatic Document Feeder");
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp31_ = SANE_I18N ("Automatic Document Feeder");
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp32_ = g_strdup (_tmp31_);
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp33_ = g_strdup ("ADF");
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp34_ = g_strdup ("Automatic Document Feeder(left aligned)");
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp35_ = g_strdup ("Automatic Document Feeder(centrally aligned)");
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp36_ = g_strdup ("ADF Simplex");
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_ = g_new0 (gchar*, 6 + 1);
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[0] = _tmp30_;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[1] = _tmp32_;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[2] = _tmp33_;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[3] = _tmp34_;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[4] = _tmp35_;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp37_[5] = _tmp36_;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_sources = _tmp37_;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_sources_length1 = 6;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_sources_size_ = adf_sources_length1;
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp38_ = g_strdup ("ADF Front");
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp39_ = SANE_I18N ("ADF Front");
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp40_ = g_strdup (_tmp39_);
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp41_ = g_new0 (gchar*, 2 + 1);
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp41_[0] = _tmp38_;
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp41_[1] = _tmp40_;
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_front_sources = _tmp41_;
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_front_sources_length1 = 2;
-#line 921 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_front_sources_size_ = adf_front_sources_length1;
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp42_ = g_strdup ("ADF Back");
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp43_ = SANE_I18N ("ADF Back");
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp44_ = g_strdup (_tmp43_);
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp45_ = g_new0 (gchar*, 2 + 1);
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp45_[0] = _tmp42_;
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp45_[1] = _tmp44_;
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_back_sources = _tmp45_;
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_back_sources_length1 = 2;
-#line 927 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_back_sources_size_ = adf_back_sources_length1;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp46_ = g_strdup ("ADF Duplex");
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp47_ = SANE_I18N ("ADF Duplex");
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp48_ = g_strdup (_tmp47_);
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp49_ = g_strdup ("ADF Duplex - Long-Edge Binding");
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp50_ = g_strdup ("ADF Duplex - Short-Edge Binding");
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp51_ = g_strdup ("Duplex");
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp52_ = g_strdup ("Automatic Document Feeder(centrally aligned,Duplex)");
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp53_ = g_strdup ("Automatic Document Feeder(left aligned,Duplex)");
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_ = g_new0 (gchar*, 7 + 1);
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[0] = _tmp46_;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[1] = _tmp48_;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[2] = _tmp49_;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[3] = _tmp50_;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[4] = _tmp51_;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[5] = _tmp52_;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp54_[6] = _tmp53_;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources = _tmp54_;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources_length1 = 7;
-#line 933 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_adf_duplex_sources_size_ = adf_duplex_sources_length1;
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp55_ = job;
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp56_ = _tmp55_->type;
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			switch (_tmp56_) {
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_SINGLE:
 #line 9099 "scanner.c"
 				{
@@ -9109,15 +9109,15 @@ static void scanner_do_get_option (Scanner* self) {
 					SANE_Option_Descriptor* _tmp58_ = NULL;
 					SANE_Int _tmp59_ = {0};
 					gboolean _tmp60_ = FALSE;
-#line 947 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp57_ = self->priv->handle;
-#line 947 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp58_ = option;
-#line 947 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp59_ = index;
-#line 947 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp60_ = scanner_set_default_option (self, _tmp57_, _tmp58_, _tmp59_);
-#line 947 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp60_) {
 #line 9115 "scanner.c"
 						SANE_Handle _tmp61_ = {0};
@@ -9126,30 +9126,30 @@ static void scanner_do_get_option (Scanner* self) {
 						gchar** _tmp64_ = NULL;
 						gint _tmp64__length1 = 0;
 						gboolean _tmp65_ = FALSE;
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp61_ = self->priv->handle;
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp62_ = option;
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp63_ = index;
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp64_ = flatbed_sources;
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp64__length1 = flatbed_sources_length1;
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp65_ = scanner_set_constrained_string_option (self, _tmp61_, _tmp62_, _tmp63_, _tmp64_, _tmp64__length1, NULL);
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp65_) {
-#line 949 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:949: Unable to set single page source, please file a bug");
 #line 9138 "scanner.c"
 						}
 					}
-#line 950 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 9143 "scanner.c"
 				}
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_FRONT:
 #line 9147 "scanner.c"
 				{
@@ -9159,19 +9159,19 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp69_ = NULL;
 					gint _tmp69__length1 = 0;
 					gboolean _tmp70_ = FALSE;
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp66_ = self->priv->handle;
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp67_ = option;
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp68_ = index;
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp69_ = adf_front_sources;
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp69__length1 = adf_front_sources_length1;
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp70_ = scanner_set_constrained_string_option (self, _tmp66_, _tmp67_, _tmp68_, _tmp69_, _tmp69__length1, NULL);
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp70_) {
 #line 9169 "scanner.c"
 						SANE_Handle _tmp71_ = {0};
@@ -9180,30 +9180,30 @@ static void scanner_do_get_option (Scanner* self) {
 						gchar** _tmp74_ = NULL;
 						gint _tmp74__length1 = 0;
 						gboolean _tmp75_ = FALSE;
-#line 953 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp71_ = self->priv->handle;
-#line 953 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp72_ = option;
-#line 953 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp73_ = index;
-#line 953 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp74_ = adf_sources;
-#line 953 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp74__length1 = adf_sources_length1;
-#line 953 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp75_ = scanner_set_constrained_string_option (self, _tmp71_, _tmp72_, _tmp73_, _tmp74_, _tmp74__length1, NULL);
-#line 953 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp75_) {
-#line 954 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:954: Unable to set front ADF source, please file a bug");
 #line 9192 "scanner.c"
 						}
 					}
-#line 955 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 9197 "scanner.c"
 				}
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BACK:
 #line 9201 "scanner.c"
 				{
@@ -9213,19 +9213,19 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp79_ = NULL;
 					gint _tmp79__length1 = 0;
 					gboolean _tmp80_ = FALSE;
-#line 957 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp76_ = self->priv->handle;
-#line 957 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp77_ = option;
-#line 957 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp78_ = index;
-#line 957 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp79_ = adf_back_sources;
-#line 957 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp79__length1 = adf_back_sources_length1;
-#line 957 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp80_ = scanner_set_constrained_string_option (self, _tmp76_, _tmp77_, _tmp78_, _tmp79_, _tmp79__length1, NULL);
-#line 957 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp80_) {
 #line 9223 "scanner.c"
 						SANE_Handle _tmp81_ = {0};
@@ -9234,30 +9234,30 @@ static void scanner_do_get_option (Scanner* self) {
 						gchar** _tmp84_ = NULL;
 						gint _tmp84__length1 = 0;
 						gboolean _tmp85_ = FALSE;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp81_ = self->priv->handle;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp82_ = option;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp83_ = index;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp84_ = adf_sources;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp84__length1 = adf_sources_length1;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp85_ = scanner_set_constrained_string_option (self, _tmp81_, _tmp82_, _tmp83_, _tmp84_, _tmp84__length1, NULL);
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp85_) {
-#line 959 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:959: Unable to set back ADF source, please file a bug");
 #line 9246 "scanner.c"
 						}
 					}
-#line 960 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 9251 "scanner.c"
 				}
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BOTH:
 #line 9255 "scanner.c"
 				{
@@ -9267,19 +9267,19 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp89_ = NULL;
 					gint _tmp89__length1 = 0;
 					gboolean _tmp90_ = FALSE;
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp86_ = self->priv->handle;
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp87_ = option;
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88_ = index;
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp89_ = adf_duplex_sources;
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp89__length1 = adf_duplex_sources_length1;
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp90_ = scanner_set_constrained_string_option (self, _tmp86_, _tmp87_, _tmp88_, _tmp89_, _tmp89__length1, NULL);
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp90_) {
 #line 9277 "scanner.c"
 						SANE_Handle _tmp91_ = {0};
@@ -9288,59 +9288,59 @@ static void scanner_do_get_option (Scanner* self) {
 						gchar** _tmp94_ = NULL;
 						gint _tmp94__length1 = 0;
 						gboolean _tmp95_ = FALSE;
-#line 963 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp91_ = self->priv->handle;
-#line 963 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp92_ = option;
-#line 963 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp93_ = index;
-#line 963 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp94_ = adf_sources;
-#line 963 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp94__length1 = adf_sources_length1;
-#line 963 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp95_ = scanner_set_constrained_string_option (self, _tmp91_, _tmp92_, _tmp93_, _tmp94_, _tmp94__length1, NULL);
-#line 963 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp95_) {
-#line 964 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:964: Unable to set duplex ADF source, please file a bug");
 #line 9300 "scanner.c"
 						}
 					}
-#line 965 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 9305 "scanner.c"
 				}
 				default:
-#line 944 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 9310 "scanner.c"
 			}
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources = (_vala_array_free (adf_duplex_sources, adf_duplex_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_back_sources = (_vala_array_free (adf_back_sources, adf_back_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_front_sources = (_vala_array_free (adf_front_sources, adf_front_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_sources = (_vala_array_free (adf_sources, adf_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources = (_vala_array_free (flatbed_sources, flatbed_sources_length1, (GDestroyNotify) g_free), NULL);
 #line 9322 "scanner.c"
 		}
-#line 970 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp96_ = self->priv->handle;
-#line 970 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp97_ = SANE_NAME_SCAN_MODE;
-#line 970 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp99_ = scanner_get_option_by_name (self, _tmp96_, _tmp97_, &_tmp98_);
-#line 970 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp98_;
-#line 970 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp99_;
-#line 971 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp100_ = option;
-#line 971 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp100_ != NULL) {
 #line 9338 "scanner.c"
 			gchar** color_scan_modes = NULL;
@@ -9392,159 +9392,159 @@ static void scanner_do_get_option (Scanner* self) {
 			gint _lineart_scan_modes_size_ = 0;
 			ScanJob* _tmp139_ = NULL;
 			ScanMode _tmp140_ = 0;
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp101_ = SANE_VALUE_SCAN_MODE_COLOR;
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = g_strdup (_tmp101_);
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp103_ = g_strdup ("Color");
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp104_ = g_strdup ("24bit Color");
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp105_ = g_strdup ("Color - 16 Million Colors");
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_ = g_new0 (gchar*, 4 + 1);
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_[0] = _tmp102_;
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_[1] = _tmp103_;
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_[2] = _tmp104_;
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_[3] = _tmp105_;
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes = _tmp106_;
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes_length1 = 4;
-#line 974 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 974 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_color_scan_modes_size_ = color_scan_modes_length1;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp107_ = SANE_VALUE_SCAN_MODE_GRAY;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp108_ = g_strdup (_tmp107_);
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp109_ = g_strdup ("Gray");
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp110_ = g_strdup ("Grayscale");
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp111_ = SANE_I18N ("Grayscale");
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp112_ = g_strdup (_tmp111_);
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp113_ = g_strdup ("True Gray");
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp114_ = g_strdup ("Grayscale - 256 Levels");
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_ = g_new0 (gchar*, 6 + 1);
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[0] = _tmp108_;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[1] = _tmp109_;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[2] = _tmp110_;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[3] = _tmp112_;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[4] = _tmp113_;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp115_[5] = _tmp114_;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			gray_scan_modes = _tmp115_;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			gray_scan_modes_length1 = 6;
-#line 981 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_gray_scan_modes_size_ = gray_scan_modes_length1;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp116_ = SANE_VALUE_SCAN_MODE_LINEART;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp117_ = g_strdup (_tmp116_);
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp118_ = g_strdup ("Lineart");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp119_ = g_strdup ("LineArt");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp120_ = SANE_I18N ("LineArt");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp121_ = g_strdup (_tmp120_);
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp122_ = g_strdup ("Black & White");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp123_ = SANE_I18N ("Black & White");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp124_ = g_strdup (_tmp123_);
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp125_ = g_strdup ("Binary");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp126_ = SANE_I18N ("Binary");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp127_ = g_strdup (_tmp126_);
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp128_ = g_strdup ("Thresholded");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp129_ = SANE_VALUE_SCAN_MODE_GRAY;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp130_ = g_strdup (_tmp129_);
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp131_ = g_strdup ("Gray");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp132_ = g_strdup ("Grayscale");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp133_ = SANE_I18N ("Grayscale");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp134_ = g_strdup (_tmp133_);
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp135_ = g_strdup ("True Gray");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp136_ = g_strdup ("Black and White - Line Art");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp137_ = g_strdup ("Black and White - Halftone");
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_ = g_new0 (gchar*, 16 + 1);
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[0] = _tmp117_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[1] = _tmp118_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[2] = _tmp119_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[3] = _tmp121_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[4] = _tmp122_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[5] = _tmp124_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[6] = _tmp125_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[7] = _tmp127_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[8] = _tmp128_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[9] = _tmp130_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[10] = _tmp131_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[11] = _tmp132_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[12] = _tmp134_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[13] = _tmp135_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[14] = _tmp136_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp138_[15] = _tmp137_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			lineart_scan_modes = _tmp138_;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			lineart_scan_modes_length1 = 16;
-#line 990 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_lineart_scan_modes_size_ = lineart_scan_modes_length1;
-#line 1010 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp139_ = job;
-#line 1010 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp140_ = _tmp139_->scan_mode;
-#line 1010 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			switch (_tmp140_) {
-#line 1010 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_COLOR:
 #line 9542 "scanner.c"
 				{
@@ -9554,29 +9554,29 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp144_ = NULL;
 					gint _tmp144__length1 = 0;
 					gboolean _tmp145_ = FALSE;
-#line 1013 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp141_ = self->priv->handle;
-#line 1013 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp142_ = option;
-#line 1013 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp143_ = index;
-#line 1013 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp144_ = color_scan_modes;
-#line 1013 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp144__length1 = color_scan_modes_length1;
-#line 1013 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp145_ = scanner_set_constrained_string_option (self, _tmp141_, _tmp142_, _tmp143_, _tmp144_, _tmp144__length1, NULL);
-#line 1013 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp145_) {
-#line 1014 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						g_warning ("scanner.vala:1014: Unable to set Color mode, please file a bug");
 #line 9566 "scanner.c"
 					}
-#line 1015 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 9570 "scanner.c"
 				}
-#line 1010 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_GRAY:
 #line 9574 "scanner.c"
 				{
@@ -9586,29 +9586,29 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp149_ = NULL;
 					gint _tmp149__length1 = 0;
 					gboolean _tmp150_ = FALSE;
-#line 1017 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp146_ = self->priv->handle;
-#line 1017 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp147_ = option;
-#line 1017 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp148_ = index;
-#line 1017 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp149_ = gray_scan_modes;
-#line 1017 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp149__length1 = gray_scan_modes_length1;
-#line 1017 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp150_ = scanner_set_constrained_string_option (self, _tmp146_, _tmp147_, _tmp148_, _tmp149_, _tmp149__length1, NULL);
-#line 1017 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp150_) {
-#line 1018 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						g_warning ("scanner.vala:1018: Unable to set Gray mode, please file a bug");
 #line 9598 "scanner.c"
 					}
-#line 1019 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 9602 "scanner.c"
 				}
-#line 1010 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_LINEART:
 #line 9606 "scanner.c"
 				{
@@ -9618,63 +9618,63 @@ static void scanner_do_get_option (Scanner* self) {
 					gchar** _tmp154_ = NULL;
 					gint _tmp154__length1 = 0;
 					gboolean _tmp155_ = FALSE;
-#line 1021 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp151_ = self->priv->handle;
-#line 1021 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp152_ = option;
-#line 1021 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp153_ = index;
-#line 1021 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp154_ = lineart_scan_modes;
-#line 1021 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp154__length1 = lineart_scan_modes_length1;
-#line 1021 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp155_ = scanner_set_constrained_string_option (self, _tmp151_, _tmp152_, _tmp153_, _tmp154_, _tmp154__length1, NULL);
-#line 1021 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1021 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp155_) {
-#line 1022 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						g_warning ("scanner.vala:1022: Unable to set Lineart mode, please file a bug");
 #line 9630 "scanner.c"
 					}
-#line 1023 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1023 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 9634 "scanner.c"
 				}
 				default:
 				{
-#line 1025 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1025 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
 #line 9640 "scanner.c"
 				}
 			}
-#line 971 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			lineart_scan_modes = (_vala_array_free (lineart_scan_modes, lineart_scan_modes_length1, (GDestroyNotify) g_free), NULL);
-#line 971 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			gray_scan_modes = (_vala_array_free (gray_scan_modes, gray_scan_modes_length1, (GDestroyNotify) g_free), NULL);
-#line 971 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes = (_vala_array_free (color_scan_modes, color_scan_modes_length1, (GDestroyNotify) g_free), NULL);
 #line 9649 "scanner.c"
 		}
-#line 1030 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp156_ = self->priv->handle;
-#line 1030 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp158_ = scanner_get_option_by_name (self, _tmp156_, "duplex", &_tmp157_);
-#line 1030 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp157_;
-#line 1030 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp158_;
-#line 1031 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp159_ = option;
-#line 1031 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp159_ != NULL) {
 #line 9663 "scanner.c"
 			SANE_Option_Descriptor* _tmp160_ = NULL;
 			SANE_Value_Type _tmp161_ = 0;
-#line 1033 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp160_ = option;
-#line 1033 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp161_ = _tmp160_->type;
-#line 1033 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp161_ == SANE_TYPE_BOOL) {
 #line 9672 "scanner.c"
 				SANE_Handle _tmp162_ = {0};
@@ -9682,41 +9682,41 @@ static void scanner_do_get_option (Scanner* self) {
 				SANE_Int _tmp164_ = {0};
 				ScanJob* _tmp165_ = NULL;
 				ScanType _tmp166_ = 0;
-#line 1034 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp162_ = self->priv->handle;
-#line 1034 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp163_ = option;
-#line 1034 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp164_ = index;
-#line 1034 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp165_ = job;
-#line 1034 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp166_ = _tmp165_->type;
-#line 1034 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp162_, _tmp163_, _tmp164_, _tmp166_ == SCAN_TYPE_ADF_BOTH, NULL);
 #line 9690 "scanner.c"
 			}
 		}
-#line 1038 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp167_ = self->priv->handle;
-#line 1038 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp169_ = scanner_get_option_by_name (self, _tmp167_, "batch-scan", &_tmp168_);
-#line 1038 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp168_;
-#line 1038 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp169_;
-#line 1039 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp170_ = option;
-#line 1039 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp170_ != NULL) {
 #line 9705 "scanner.c"
 			SANE_Option_Descriptor* _tmp171_ = NULL;
 			SANE_Value_Type _tmp172_ = 0;
-#line 1041 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp171_ = option;
-#line 1041 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp172_ = _tmp171_->type;
-#line 1041 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp172_ == SANE_TYPE_BOOL) {
 #line 9714 "scanner.c"
 				SANE_Handle _tmp173_ = {0};
@@ -9724,32 +9724,32 @@ static void scanner_do_get_option (Scanner* self) {
 				SANE_Int _tmp175_ = {0};
 				ScanJob* _tmp176_ = NULL;
 				ScanType _tmp177_ = 0;
-#line 1042 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp173_ = self->priv->handle;
-#line 1042 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp174_ = option;
-#line 1042 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp175_ = index;
-#line 1042 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp176_ = job;
-#line 1042 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp177_ = _tmp176_->type;
-#line 1042 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp173_, _tmp174_, _tmp175_, _tmp177_ != SCAN_TYPE_SINGLE, NULL);
 #line 9732 "scanner.c"
 			}
 		}
-#line 1046 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp178_ = self->priv->handle;
-#line 1046 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp180_ = scanner_get_option_by_name (self, _tmp178_, "compression", &_tmp179_);
-#line 1046 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp179_;
-#line 1046 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp180_;
-#line 1047 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp181_ = option;
-#line 1047 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp181_ != NULL) {
 #line 9747 "scanner.c"
 			gchar** disable_compression_names = NULL;
@@ -9768,69 +9768,69 @@ static void scanner_do_get_option (Scanner* self) {
 			gchar** _tmp192_ = NULL;
 			gint _tmp192__length1 = 0;
 			gboolean _tmp193_ = FALSE;
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp182_ = SANE_I18N ("None");
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp183_ = g_strdup (_tmp182_);
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp184_ = SANE_I18N ("none");
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp185_ = g_strdup (_tmp184_);
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp186_ = g_strdup ("None");
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp187_ = g_strdup ("none");
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_ = g_new0 (gchar*, 4 + 1);
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_[0] = _tmp183_;
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_[1] = _tmp185_;
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_[2] = _tmp186_;
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp188_[3] = _tmp187_;
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names = _tmp188_;
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names_length1 = 4;
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_disable_compression_names_size_ = disable_compression_names_length1;
-#line 1057 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp189_ = self->priv->handle;
-#line 1057 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp190_ = option;
-#line 1057 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp191_ = index;
-#line 1057 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp192_ = disable_compression_names;
-#line 1057 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp192__length1 = disable_compression_names_length1;
-#line 1057 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp193_ = scanner_set_constrained_string_option (self, _tmp189_, _tmp190_, _tmp191_, _tmp192_, _tmp192__length1, NULL);
-#line 1057 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp193_) {
-#line 1058 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				g_warning ("scanner.vala:1058: Unable to disable compression, please file a bug");
 #line 9808 "scanner.c"
 			}
-#line 1047 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names = (_vala_array_free (disable_compression_names, disable_compression_names_length1, (GDestroyNotify) g_free), NULL);
 #line 9812 "scanner.c"
 		}
-#line 1062 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp194_ = self->priv->handle;
-#line 1062 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp195_ = SANE_NAME_SCAN_RESOLUTION;
-#line 1062 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp197_ = scanner_get_option_by_name (self, _tmp194_, _tmp195_, &_tmp196_);
-#line 1062 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp196_;
-#line 1062 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp197_;
-#line 1063 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp198_ = option;
-#line 1063 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp198_ != NULL) {
 #line 9828 "scanner.c"
 			SANE_Handle _tmp199_ = {0};
@@ -9845,44 +9845,44 @@ static void scanner_do_get_option (Scanner* self) {
 			gint _tmp208_ = 0;
 			SANE_Option_Descriptor* _tmp209_ = NULL;
 			SANE_Option_Descriptor* _tmp210_ = NULL;
-#line 1065 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp199_ = self->priv->handle;
-#line 1065 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp200_ = option;
-#line 1065 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp201_ = index;
-#line 1065 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp202_ = job;
-#line 1065 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp203_ = _tmp202_->dpi;
-#line 1065 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp204_ = job;
-#line 1065 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_set_fixed_or_int_option (self, _tmp199_, _tmp200_, _tmp201_, _tmp203_, &_tmp205_);
-#line 1065 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp204_->dpi = _tmp205_;
-#line 1066 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp206_ = self->priv->handle;
-#line 1066 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp207_ = SANE_NAME_BIT_DEPTH;
-#line 1066 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp209_ = scanner_get_option_by_name (self, _tmp206_, _tmp207_, &_tmp208_);
-#line 1066 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp208_;
-#line 1066 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp209_;
-#line 1067 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp210_ = option;
-#line 1067 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp210_ != NULL) {
 #line 9871 "scanner.c"
 				ScanJob* _tmp211_ = NULL;
 				gint _tmp212_ = 0;
-#line 1069 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp211_ = job;
-#line 1069 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp212_ = _tmp211_->depth;
-#line 1069 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp212_ > 0) {
 #line 9880 "scanner.c"
 					SANE_Handle _tmp213_ = {0};
@@ -9890,44 +9890,44 @@ static void scanner_do_get_option (Scanner* self) {
 					SANE_Int _tmp215_ = {0};
 					ScanJob* _tmp216_ = NULL;
 					gint _tmp217_ = 0;
-#line 1070 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp213_ = self->priv->handle;
-#line 1070 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp214_ = option;
-#line 1070 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp215_ = index;
-#line 1070 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp216_ = job;
-#line 1070 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp217_ = _tmp216_->depth;
-#line 1070 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_set_int_option (self, _tmp213_, _tmp214_, _tmp215_, _tmp217_, NULL);
 #line 9898 "scanner.c"
 				}
 			}
 		}
-#line 1075 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp218_ = self->priv->handle;
-#line 1075 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp219_ = SANE_NAME_SCAN_BR_X;
-#line 1075 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp221_ = scanner_get_option_by_name (self, _tmp218_, _tmp219_, &_tmp220_);
-#line 1075 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp220_;
-#line 1075 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp221_;
-#line 1076 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp222_ = option;
-#line 1076 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp222_ != NULL) {
 #line 9916 "scanner.c"
 			ScanJob* _tmp223_ = NULL;
 			gint _tmp224_ = 0;
-#line 1078 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp223_ = job;
-#line 1078 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp224_ = _tmp223_->page_width;
-#line 1078 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp224_ > 0) {
 #line 9925 "scanner.c"
 				SANE_Handle _tmp225_ = {0};
@@ -9939,64 +9939,64 @@ static void scanner_do_get_option (Scanner* self) {
 				ScanJob* _tmp231_ = NULL;
 				gdouble _tmp232_ = 0.0;
 				gdouble _tmp233_ = 0.0;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp225_ = self->priv->handle;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp226_ = option;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp227_ = index;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp228_ = option;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp229_ = job;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp230_ = _tmp229_->page_width;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp231_ = job;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp232_ = _tmp231_->dpi;
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp233_ = scanner_convert_page_size (self, _tmp228_, (gdouble) _tmp230_, _tmp232_);
-#line 1079 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_fixed_or_int_option (self, _tmp225_, _tmp226_, _tmp227_, _tmp233_, NULL);
 #line 9955 "scanner.c"
 			} else {
 				SANE_Handle _tmp234_ = {0};
 				SANE_Option_Descriptor* _tmp235_ = NULL;
 				SANE_Int _tmp236_ = {0};
-#line 1081 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp234_ = self->priv->handle;
-#line 1081 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp235_ = option;
-#line 1081 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp236_ = index;
-#line 1081 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_option_to_max (self, _tmp234_, _tmp235_, _tmp236_);
 #line 9968 "scanner.c"
 			}
 		}
-#line 1083 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp237_ = self->priv->handle;
-#line 1083 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp238_ = SANE_NAME_SCAN_BR_Y;
-#line 1083 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp240_ = scanner_get_option_by_name (self, _tmp237_, _tmp238_, &_tmp239_);
-#line 1083 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp239_;
-#line 1083 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp240_;
-#line 1084 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp241_ = option;
-#line 1084 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp241_ != NULL) {
 #line 9985 "scanner.c"
 			ScanJob* _tmp242_ = NULL;
 			gint _tmp243_ = 0;
-#line 1086 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp242_ = job;
-#line 1086 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp243_ = _tmp242_->page_height;
-#line 1086 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp243_ > 0) {
 #line 9994 "scanner.c"
 				SANE_Handle _tmp244_ = {0};
@@ -10008,72 +10008,72 @@ static void scanner_do_get_option (Scanner* self) {
 				ScanJob* _tmp250_ = NULL;
 				gdouble _tmp251_ = 0.0;
 				gdouble _tmp252_ = 0.0;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp244_ = self->priv->handle;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp245_ = option;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp246_ = index;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp247_ = option;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp248_ = job;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp249_ = _tmp248_->page_height;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp250_ = job;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp251_ = _tmp250_->dpi;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp252_ = scanner_convert_page_size (self, _tmp247_, (gdouble) _tmp249_, _tmp251_);
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_fixed_or_int_option (self, _tmp244_, _tmp245_, _tmp246_, _tmp252_, NULL);
 #line 10024 "scanner.c"
 			} else {
 				SANE_Handle _tmp253_ = {0};
 				SANE_Option_Descriptor* _tmp254_ = NULL;
 				SANE_Int _tmp255_ = {0};
-#line 1089 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1089 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp253_ = self->priv->handle;
-#line 1089 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1089 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp254_ = option;
-#line 1089 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1089 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp255_ = index;
-#line 1089 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1089 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_option_to_max (self, _tmp253_, _tmp254_, _tmp255_);
 #line 10037 "scanner.c"
 			}
 		}
-#line 1093 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp256_ = self->priv->handle;
-#line 1093 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp257_ = SANE_NAME_PAGE_WIDTH;
-#line 1093 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp259_ = scanner_get_option_by_name (self, _tmp256_, _tmp257_, &_tmp258_);
-#line 1093 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp258_;
-#line 1093 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp259_;
-#line 1094 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp261_ = option;
-#line 1094 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp261_ != NULL) {
 #line 10054 "scanner.c"
 			ScanJob* _tmp262_ = NULL;
 			gint _tmp263_ = 0;
-#line 1094 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp262_ = job;
-#line 1094 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp263_ = _tmp262_->page_width;
-#line 1094 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp260_ = ((gdouble) _tmp263_) > 0.0;
 #line 10063 "scanner.c"
 		} else {
-#line 1094 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp260_ = FALSE;
 #line 10067 "scanner.c"
 		}
-#line 1094 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp260_) {
 #line 10071 "scanner.c"
 			SANE_Handle _tmp264_ = {0};
@@ -10085,58 +10085,58 @@ static void scanner_do_get_option (Scanner* self) {
 			ScanJob* _tmp270_ = NULL;
 			gdouble _tmp271_ = 0.0;
 			gdouble _tmp272_ = 0.0;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp264_ = self->priv->handle;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp265_ = option;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp266_ = index;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp267_ = option;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp268_ = job;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp269_ = _tmp268_->page_width;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp270_ = job;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp271_ = _tmp270_->dpi;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp272_ = scanner_convert_page_size (self, _tmp267_, (gdouble) _tmp269_, _tmp271_);
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_set_fixed_or_int_option (self, _tmp264_, _tmp265_, _tmp266_, _tmp272_, NULL);
 #line 10101 "scanner.c"
 		}
-#line 1096 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp273_ = self->priv->handle;
-#line 1096 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp274_ = SANE_NAME_PAGE_HEIGHT;
-#line 1096 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp276_ = scanner_get_option_by_name (self, _tmp273_, _tmp274_, &_tmp275_);
-#line 1096 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp275_;
-#line 1096 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp276_;
-#line 1097 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp278_ = option;
-#line 1097 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp278_ != NULL) {
 #line 10117 "scanner.c"
 			ScanJob* _tmp279_ = NULL;
 			gint _tmp280_ = 0;
-#line 1097 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp279_ = job;
-#line 1097 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp280_ = _tmp279_->page_height;
-#line 1097 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp277_ = ((gdouble) _tmp280_) > 0.0;
 #line 10126 "scanner.c"
 		} else {
-#line 1097 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp277_ = FALSE;
 #line 10130 "scanner.c"
 		}
-#line 1097 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp277_) {
 #line 10134 "scanner.c"
 			SANE_Handle _tmp281_ = {0};
@@ -10148,50 +10148,50 @@ static void scanner_do_get_option (Scanner* self) {
 			ScanJob* _tmp287_ = NULL;
 			gdouble _tmp288_ = 0.0;
 			gdouble _tmp289_ = 0.0;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp281_ = self->priv->handle;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp282_ = option;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp283_ = index;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp284_ = option;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp285_ = job;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp286_ = _tmp285_->page_height;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp287_ = job;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp288_ = _tmp287_->dpi;
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp289_ = scanner_convert_page_size (self, _tmp284_, (gdouble) _tmp286_, _tmp288_);
-#line 1098 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_set_fixed_or_int_option (self, _tmp281_, _tmp282_, _tmp283_, _tmp289_, NULL);
 #line 10164 "scanner.c"
 		}
-#line 1100 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp290_ = self->priv->handle;
-#line 1100 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp291_ = SANE_NAME_BRIGHTNESS;
-#line 1100 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp293_ = scanner_get_option_by_name (self, _tmp290_, _tmp291_, &_tmp292_);
-#line 1100 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp292_;
-#line 1100 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp293_;
-#line 1101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp294_ = option;
-#line 1101 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp294_ != NULL) {
 #line 10180 "scanner.c"
 			ScanJob* _tmp295_ = NULL;
 			gint _tmp296_ = 0;
-#line 1103 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp295_ = job;
-#line 1103 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp296_ = _tmp295_->brightness;
-#line 1103 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp296_ != 0) {
 #line 10189 "scanner.c"
 				gint brightness = 0;
@@ -10203,51 +10203,51 @@ static void scanner_do_get_option (Scanner* self) {
 				SANE_Option_Descriptor* _tmp302_ = NULL;
 				SANE_Int _tmp303_ = {0};
 				gint _tmp304_ = 0;
-#line 1105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp297_ = option;
-#line 1105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp298_ = job;
-#line 1105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp299_ = _tmp298_->brightness;
-#line 1105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp300_ = scanner_scale_int (self, -100, 100, _tmp297_, _tmp299_);
-#line 1105 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				brightness = _tmp300_;
-#line 1106 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp301_ = self->priv->handle;
-#line 1106 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp302_ = option;
-#line 1106 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp303_ = index;
-#line 1106 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp304_ = brightness;
-#line 1106 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp301_, _tmp302_, _tmp303_, _tmp304_, NULL);
 #line 10219 "scanner.c"
 			}
 		}
-#line 1109 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp305_ = self->priv->handle;
-#line 1109 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp306_ = SANE_NAME_CONTRAST;
-#line 1109 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp308_ = scanner_get_option_by_name (self, _tmp305_, _tmp306_, &_tmp307_);
-#line 1109 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		index = (SANE_Int) _tmp307_;
-#line 1109 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		option = _tmp308_;
-#line 1110 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp309_ = option;
-#line 1110 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp309_ != NULL) {
 #line 10236 "scanner.c"
 			ScanJob* _tmp310_ = NULL;
 			gint _tmp311_ = 0;
-#line 1112 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp310_ = job;
-#line 1112 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp311_ = _tmp310_->contrast;
-#line 1112 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp311_ != 0) {
 #line 10245 "scanner.c"
 				gint contrast = 0;
@@ -10259,32 +10259,32 @@ static void scanner_do_get_option (Scanner* self) {
 				SANE_Option_Descriptor* _tmp317_ = NULL;
 				SANE_Int _tmp318_ = {0};
 				gint _tmp319_ = 0;
-#line 1114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp312_ = option;
-#line 1114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp313_ = job;
-#line 1114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp314_ = _tmp313_->contrast;
-#line 1114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp315_ = scanner_scale_int (self, -100, 100, _tmp312_, _tmp314_);
-#line 1114 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				contrast = _tmp315_;
-#line 1115 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp316_ = self->priv->handle;
-#line 1115 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp317_ = option;
-#line 1115 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp318_ = index;
-#line 1115 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp319_ = contrast;
-#line 1115 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp316_, _tmp317_, _tmp318_, _tmp319_, NULL);
 #line 10275 "scanner.c"
 			}
 		}
-#line 1120 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp320_ = self->priv->current_device;
-#line 1120 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (g_strcmp0 (_tmp320_, "test") == 0) {
 #line 10282 "scanner.c"
 			SANE_Handle _tmp321_ = {0};
@@ -10307,200 +10307,200 @@ static void scanner_do_get_option (Scanner* self) {
 			gint _tmp350_ = 0;
 			SANE_Option_Descriptor* _tmp351_ = NULL;
 			SANE_Option_Descriptor* _tmp352_ = NULL;
-#line 1122 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp321_ = self->priv->handle;
-#line 1122 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp323_ = scanner_get_option_by_name (self, _tmp321_, "hand-scanner", &_tmp322_);
-#line 1122 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp322_;
-#line 1122 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp323_;
-#line 1123 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp324_ = option;
-#line 1123 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp324_ != NULL) {
 #line 10315 "scanner.c"
 				SANE_Handle _tmp325_ = {0};
 				SANE_Option_Descriptor* _tmp326_ = NULL;
 				SANE_Int _tmp327_ = {0};
-#line 1124 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp325_ = self->priv->handle;
-#line 1124 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp326_ = option;
-#line 1124 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp327_ = index;
-#line 1124 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp325_, _tmp326_, _tmp327_, FALSE, NULL);
 #line 10327 "scanner.c"
 			}
-#line 1125 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp328_ = self->priv->handle;
-#line 1125 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp330_ = scanner_get_option_by_name (self, _tmp328_, "three-pass", &_tmp329_);
-#line 1125 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp329_;
-#line 1125 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp330_;
-#line 1126 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp331_ = option;
-#line 1126 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp331_ != NULL) {
 #line 10341 "scanner.c"
 				SANE_Handle _tmp332_ = {0};
 				SANE_Option_Descriptor* _tmp333_ = NULL;
 				SANE_Int _tmp334_ = {0};
-#line 1127 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp332_ = self->priv->handle;
-#line 1127 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp333_ = option;
-#line 1127 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp334_ = index;
-#line 1127 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp332_, _tmp333_, _tmp334_, FALSE, NULL);
 #line 10353 "scanner.c"
 			}
-#line 1128 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp335_ = self->priv->handle;
-#line 1128 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp337_ = scanner_get_option_by_name (self, _tmp335_, "test-picture", &_tmp336_);
-#line 1128 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp336_;
-#line 1128 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp337_;
-#line 1129 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp338_ = option;
-#line 1129 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp338_ != NULL) {
 #line 10367 "scanner.c"
 				SANE_Handle _tmp339_ = {0};
 				SANE_Option_Descriptor* _tmp340_ = NULL;
 				SANE_Int _tmp341_ = {0};
-#line 1130 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp339_ = self->priv->handle;
-#line 1130 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp340_ = option;
-#line 1130 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp341_ = index;
-#line 1130 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_string_option (self, _tmp339_, _tmp340_, _tmp341_, "Color pattern", NULL);
 #line 10379 "scanner.c"
 			}
-#line 1131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp342_ = self->priv->handle;
-#line 1131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp344_ = scanner_get_option_by_name (self, _tmp342_, "read-delay", &_tmp343_);
-#line 1131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp343_;
-#line 1131 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp344_;
-#line 1132 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp345_ = option;
-#line 1132 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp345_ != NULL) {
 #line 10393 "scanner.c"
 				SANE_Handle _tmp346_ = {0};
 				SANE_Option_Descriptor* _tmp347_ = NULL;
 				SANE_Int _tmp348_ = {0};
-#line 1133 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp346_ = self->priv->handle;
-#line 1133 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp347_ = option;
-#line 1133 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp348_ = index;
-#line 1133 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp346_, _tmp347_, _tmp348_, TRUE, NULL);
 #line 10405 "scanner.c"
 			}
-#line 1134 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp349_ = self->priv->handle;
-#line 1134 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp351_ = scanner_get_option_by_name (self, _tmp349_, "read-delay-duration", &_tmp350_);
-#line 1134 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			index = (SANE_Int) _tmp350_;
-#line 1134 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp351_;
-#line 1135 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1135 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp352_ = option;
-#line 1135 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1135 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp352_ != NULL) {
 #line 10419 "scanner.c"
 				SANE_Handle _tmp353_ = {0};
 				SANE_Option_Descriptor* _tmp354_ = NULL;
 				SANE_Int _tmp355_ = {0};
-#line 1136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp353_ = self->priv->handle;
-#line 1136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp354_ = option;
-#line 1136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp355_ = index;
-#line 1136 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp353_, _tmp354_, _tmp355_, 200000, NULL);
 #line 10431 "scanner.c"
 			}
 		}
-#line 1139 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1139 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_START;
-#line 1140 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1140 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 10440 "scanner.c"
 	}
-#line 1143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp356_ = index;
-#line 1143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp357_ = option;
-#line 1143 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_log_option (self, _tmp356_, _tmp357_);
-#line 1146 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp358_ = option;
-#line 1146 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp359_ = _tmp358_->type;
-#line 1146 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp359_ == SANE_TYPE_GROUP) {
-#line 1147 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1147 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 10458 "scanner.c"
 	}
-#line 1150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp360_ = option;
-#line 1150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp361_ = _tmp360_->cap;
-#line 1150 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if ((_tmp361_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
-#line 1151 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1151 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 10470 "scanner.c"
 	}
-#line 1154 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp362_ = option;
-#line 1154 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp363_ = _tmp362_->name;
-#line 1154 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp363_ == NULL) {
-#line 1155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1155 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 10482 "scanner.c"
 	}
-#line 1157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp364_ = self->priv->options;
-#line 1157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp365_ = option;
-#line 1157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp366_ = _tmp365_->name;
-#line 1157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp367_ = g_strdup (_tmp366_);
-#line 1157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp368_ = index;
-#line 1157 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_hash_table_insert (_tmp364_, _tmp367_, (gpointer) ((gintptr) ((gint) _tmp368_)));
-#line 879 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
 #line 10498 "scanner.c"
 }
@@ -10510,52 +10510,52 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 	gdouble result = 0.0;
 	SANE_Option_Descriptor* _tmp0_ = NULL;
 	SANE_Unit _tmp1_ = 0;
-#line 1160 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, 0.0);
-#line 1160 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (option != NULL, 0.0);
-#line 1162 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = option;
-#line 1162 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->unit;
-#line 1162 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SANE_UNIT_PIXEL) {
 #line 10516 "scanner.c"
 		gdouble _tmp2_ = 0.0;
 		gdouble _tmp3_ = 0.0;
-#line 1163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = dpi;
-#line 1163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = size;
-#line 1163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = (_tmp2_ * _tmp3_) / 254.0;
-#line 1163 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
 #line 10527 "scanner.c"
 	} else {
 		SANE_Option_Descriptor* _tmp4_ = NULL;
 		SANE_Unit _tmp5_ = 0;
-#line 1164 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = option;
-#line 1164 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp5_ = _tmp4_->unit;
-#line 1164 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp5_ == SANE_UNIT_MM) {
 #line 10537 "scanner.c"
 			gdouble _tmp6_ = 0.0;
-#line 1165 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = size;
-#line 1165 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp6_ / 10.0;
-#line 1165 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 10545 "scanner.c"
 		} else {
-#line 1168 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:1168: Unable to set unsupported unit type");
-#line 1169 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = (gdouble) 0.0f;
-#line 1169 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 10553 "scanner.c"
 		}
@@ -10573,49 +10573,49 @@ static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_H
 	SANE_Handle _tmp4_ = {0};
 	gint _tmp5_ = 0;
 	SANE_Option_Descriptor* _tmp6_ = NULL;
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 1175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->options;
-#line 1175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = name;
-#line 1175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = g_hash_table_lookup (_tmp0_, _tmp1_);
-#line 1175 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_vala_index = (gint) ((gintptr) _tmp2_);
-#line 1176 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = _vala_index;
-#line 1176 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp3_ == 0) {
-#line 1177 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = NULL;
-#line 1177 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (index) {
-#line 1177 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			*index = _vala_index;
 #line 10591 "scanner.c"
 		}
-#line 1177 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
 #line 10595 "scanner.c"
 	}
-#line 1179 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = handle;
-#line 1179 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _vala_index;
-#line 1179 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = sane_get_option_descriptor (_tmp4_, (SANE_Int) _tmp5_);
-#line 1179 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp6_;
-#line 1179 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (index) {
-#line 1179 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*index = _vala_index;
 #line 10609 "scanner.c"
 	}
-#line 1179 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 10613 "scanner.c"
 }
@@ -10627,39 +10627,39 @@ static void scanner_do_complete_document (Scanner* self) {
 	GList* _tmp2_ = NULL;
 	NotifyDocumentDone* _tmp3_ = NULL;
 	NotifyDocumentDone* _tmp4_ = NULL;
-#line 1182 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1184 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->handle;
-#line 1184 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	sane_cancel (_tmp0_);
-#line 1185 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1185: sane_cancel ()");
-#line 1187 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->job_queue;
-#line 1187 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->job_queue = g_list_remove_link (self->priv->job_queue, _tmp1_);
-#line 1189 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
-#line 1192 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->job_queue;
-#line 1192 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_ != NULL) {
-#line 1194 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_OPEN;
-#line 1195 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1195 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 10645 "scanner.c"
 	}
-#line 1201 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = notify_document_done_new ();
-#line 1201 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_;
-#line 1201 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp4_);
-#line 1201 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp4_);
-#line 1202 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1202 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
 #line 10657 "scanner.c"
 }
@@ -10677,50 +10677,50 @@ static void scanner_do_start (Scanner* self) {
 	gchar* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
 	SANE_Status _tmp9_ = 0;
-#line 1205 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1205 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1209 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = notify_expect_page_new ();
-#line 1209 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_;
-#line 1209 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp1_);
-#line 1209 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp1_);
-#line 1211 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->handle;
-#line 1211 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = sane_start (_tmp2_);
-#line 1211 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp3_;
-#line 1212 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->page_number;
-#line 1212 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->pass_number;
-#line 1212 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = status;
-#line 1212 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = sane_status_to_string (_tmp6_);
-#line 1212 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_;
-#line 1212 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1212: sane_start (page=%d, pass=%d) -> %s", _tmp4_, _tmp5_, _tmp8_);
-#line 1212 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp8_);
-#line 1213 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = status;
-#line 1213 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ == SANE_STATUS_GOOD) {
-#line 1214 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_GET_PARAMETERS;
 #line 10709 "scanner.c"
 	} else {
 		SANE_Status _tmp10_ = 0;
-#line 1215 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = status;
-#line 1215 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp10_ == SANE_STATUS_NO_DOCS) {
-#line 1216 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_do_complete_document (self);
 #line 10718 "scanner.c"
 		} else {
@@ -10728,17 +10728,17 @@ static void scanner_do_start (Scanner* self) {
 			const gchar* _tmp12_ = NULL;
 			SANE_Status _tmp13_ = 0;
 			const gchar* _tmp14_ = NULL;
-#line 1219 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp11_ = status;
-#line 1219 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp12_ = sane_strstatus (_tmp11_);
-#line 1219 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:1219: Unable to start device: %s", _tmp12_);
-#line 1220 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp13_ = status;
-#line 1220 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp14_ = _ ("Unable to start scan");
-#line 1220 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_fail_scan (self, (gint) _tmp13_, _tmp14_);
 #line 10736 "scanner.c"
 		}
@@ -10749,72 +10749,72 @@ static void scanner_do_start (Scanner* self) {
 static gchar* sane_frame_to_string (SANE_Frame frame) {
 	gchar* result = NULL;
 	SANE_Frame _tmp0_ = 0;
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	_tmp0_ = frame;
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 	switch (_tmp0_) {
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GRAY:
 #line 10751 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 106 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp1_ = g_strdup ("SANE_FRAME_GRAY");
-#line 106 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp1_;
-#line 106 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 10760 "scanner.c"
 		}
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RGB:
 #line 10764 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp2_ = g_strdup ("SANE_FRAME_RGB");
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp2_;
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 10773 "scanner.c"
 		}
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RED:
 #line 10777 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp3_ = g_strdup ("SANE_FRAME_RED");
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp3_;
-#line 110 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 10786 "scanner.c"
 		}
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GREEN:
 #line 10790 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp4_ = g_strdup ("SANE_FRAME_GREEN");
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp4_;
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 10799 "scanner.c"
 		}
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_BLUE:
 #line 10803 "scanner.c"
 		{
 			gchar* _tmp5_ = NULL;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp5_ = g_strdup ("SANE_FRAME_BLUE");
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp5_;
-#line 114 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 10812 "scanner.c"
 		}
@@ -10822,13 +10822,13 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 		{
 			SANE_Frame _tmp6_ = 0;
 			gchar* _tmp7_ = NULL;
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp6_ = frame;
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			_tmp7_ = g_strdup_printf ("SANE_FRAME(%d)", (gint) _tmp6_);
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			result = _tmp7_;
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/sane.vapi"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
 #line 10826 "scanner.c"
 		}
@@ -10897,242 +10897,242 @@ static void scanner_do_get_parameters (Scanner* self) {
 	gint _tmp72_ = 0;
 	gint _tmp73_ = 0;
 	guchar* _tmp74_ = NULL;
-#line 1226 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1228 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->handle;
-#line 1228 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = sane_get_parameters (_tmp0_, &_tmp1_);
-#line 1228 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->parameters = _tmp1_;
-#line 1228 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp2_;
-#line 1229 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = status;
-#line 1229 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = sane_status_to_string (_tmp3_);
-#line 1229 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = _tmp4_;
-#line 1229 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1229: sane_get_parameters () -> %s", _tmp5_);
-#line 1229 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp5_);
-#line 1230 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = status;
-#line 1230 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != SANE_STATUS_GOOD) {
 #line 10917 "scanner.c"
 		SANE_Status _tmp7_ = 0;
 		const gchar* _tmp8_ = NULL;
 		SANE_Status _tmp9_ = 0;
 		const gchar* _tmp10_ = NULL;
-#line 1232 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1232 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = status;
-#line 1232 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1232 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp8_ = sane_strstatus (_tmp7_);
-#line 1232 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1232 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:1232: Unable to get device parameters: %s", _tmp8_);
-#line 1233 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = status;
-#line 1233 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = _ ("Error communicating with scanner");
-#line 1233 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp9_, _tmp10_);
-#line 1236 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 10936 "scanner.c"
 	}
-#line 1239 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = self->priv->job_queue;
-#line 1239 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = _tmp11_->data;
-#line 1239 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp12_, TYPE_SCAN_JOB, ScanJob));
-#line 1239 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp13_;
-#line 1243 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = self->priv->parameters;
-#line 1243 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = _tmp15_.last_frame;
-#line 1243 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp16_) {
-#line 1243 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_TRUE";
 #line 10954 "scanner.c"
 	} else {
-#line 1243 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_FALSE";
 #line 10958 "scanner.c"
 	}
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = self->priv->parameters;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = _tmp17_.format;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = sane_frame_to_string (_tmp18_);
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = _tmp19_;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = self->priv->parameters;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = _tmp21_.bytes_per_line;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = self->priv->parameters;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = _tmp23_.pixels_per_line;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = self->priv->parameters;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = _tmp25_.lines;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = self->priv->parameters;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = _tmp27_.depth;
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1241: Parameters: format=%s last_frame=%s bytes_per_line=" \
 "%d pixels_per_line=%d lines=%d depth=%d", _tmp20_, _tmp14_, _tmp22_, _tmp24_, _tmp26_, _tmp28_);
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp20_);
-#line 1249 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = scan_page_info_new ();
-#line 1249 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	info = _tmp29_;
-#line 1250 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = info;
-#line 1250 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = self->priv->parameters;
-#line 1250 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp32_ = _tmp31_.pixels_per_line;
-#line 1250 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_->width = _tmp32_;
-#line 1251 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_ = info;
-#line 1251 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = self->priv->parameters;
-#line 1251 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = _tmp34_.lines;
-#line 1251 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1251 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_->height = _tmp35_;
-#line 1252 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = info;
-#line 1252 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_ = self->priv->parameters;
-#line 1252 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = _tmp37_.depth;
-#line 1252 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_->depth = _tmp38_;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = self->priv->parameters;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = _tmp42_.depth;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp43_ == 8) {
 #line 11022 "scanner.c"
 		SANE_Parameters _tmp44_ = {0};
 		SANE_Frame _tmp45_ = 0;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp44_ = self->priv->parameters;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp45_ = _tmp44_.format;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = _tmp45_ == SANE_FRAME_GRAY;
 #line 11031 "scanner.c"
 	} else {
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = FALSE;
 #line 11035 "scanner.c"
 	}
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp41_) {
 #line 11039 "scanner.c"
 		ScanJob* _tmp46_ = NULL;
 		gint _tmp47_ = 0;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp46_ = job;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp47_ = _tmp46_->depth;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = _tmp47_ == 2;
 #line 11048 "scanner.c"
 	} else {
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = FALSE;
 #line 11052 "scanner.c"
 	}
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp40_) {
 #line 11056 "scanner.c"
 		ScanJob* _tmp48_ = NULL;
 		ScanMode _tmp49_ = 0;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp48_ = job;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp49_ = _tmp48_->scan_mode;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp39_ = _tmp49_ == SCAN_MODE_GRAY;
 #line 11065 "scanner.c"
 	} else {
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp39_ = FALSE;
 #line 11069 "scanner.c"
 	}
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp39_) {
 #line 11073 "scanner.c"
 		ScanPageInfo* _tmp50_ = NULL;
 		ScanJob* _tmp51_ = NULL;
 		gint _tmp52_ = 0;
-#line 1256 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp50_ = info;
-#line 1256 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp51_ = job;
-#line 1256 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp52_ = _tmp51_->depth;
-#line 1256 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp50_->depth = _tmp52_;
 #line 11085 "scanner.c"
 	}
-#line 1257 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp54_ = self->priv->parameters;
-#line 1257 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp55_ = _tmp54_.format;
-#line 1257 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp55_ == SANE_FRAME_GRAY) {
-#line 1257 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = 1;
 #line 11095 "scanner.c"
 	} else {
-#line 1257 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = 3;
 #line 11099 "scanner.c"
 	}
-#line 1257 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp56_ = info;
-#line 1257 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp56_->n_channels = _tmp53_;
-#line 1258 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp57_ = info;
-#line 1258 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp58_ = job;
-#line 1258 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp59_ = _tmp58_->dpi;
-#line 1258 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp57_->dpi = _tmp59_;
-#line 1259 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp60_ = info;
-#line 1259 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp61_ = self->priv->current_device;
-#line 1259 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp62_ = g_strdup (_tmp61_);
-#line 1259 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp60_->device);
-#line 1259 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp60_->device = _tmp62_;
-#line 1261 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp63_ = self->priv->page_number;
-#line 1261 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp64_ = self->priv->notified_page;
-#line 1261 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp63_ != _tmp64_) {
 #line 11129 "scanner.c"
 		ScanJob* _tmp65_ = NULL;
@@ -11141,55 +11141,55 @@ static void scanner_do_get_parameters (Scanner* self) {
 		NotifyGotPageInfo* _tmp68_ = NULL;
 		NotifyGotPageInfo* _tmp69_ = NULL;
 		gint _tmp70_ = 0;
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp65_ = job;
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp66_ = _tmp65_->id;
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp67_ = info;
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp68_ = notify_got_page_info_new (_tmp66_, _tmp67_);
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp69_ = _tmp68_;
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp69_);
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp69_);
-#line 1264 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp70_ = self->priv->page_number;
-#line 1264 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->notified_page = _tmp70_;
 #line 11154 "scanner.c"
 	}
-#line 1268 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp71_ = self->priv->parameters;
-#line 1268 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp72_ = _tmp71_.bytes_per_line;
-#line 1268 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	buffer_size = _tmp72_ + 1;
-#line 1269 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp73_ = buffer_size;
-#line 1269 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp74_ = g_new0 (guchar, _tmp73_);
-#line 1269 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 1269 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = _tmp74_;
-#line 1269 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer_length1 = _tmp73_;
-#line 1269 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->_buffer_size_ = self->priv->buffer_length1;
-#line 1270 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->n_used = 0;
-#line 1271 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->line_count = 0;
-#line 1272 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1272 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->pass_number = 0;
-#line 1273 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_READ;
-#line 1226 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_page_info_unref0 (info);
-#line 1226 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
 #line 11186 "scanner.c"
 }
@@ -11208,53 +11208,53 @@ static void scanner_do_complete_page (Scanner* self) {
 	gboolean _tmp8_ = FALSE;
 	ScanJob* _tmp10_ = NULL;
 	ScanType _tmp11_ = 0;
-#line 1276 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1278 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 1278 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 1278 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 1278 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = job;
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->id;
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = notify_page_done_new (_tmp4_);
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = _tmp5_;
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_notify (self, (Notify*) _tmp6_);
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp6_);
-#line 1283 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = self->priv->parameters;
-#line 1283 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_.last_frame;
-#line 1283 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!_tmp8_) {
 #line 11231 "scanner.c"
 		gint _tmp9_ = 0;
-#line 1285 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1285 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->pass_number;
-#line 1285 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1285 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->pass_number = _tmp9_ + 1;
-#line 1286 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1286 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_START;
-#line 1287 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1287 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 11243 "scanner.c"
 	}
-#line 1291 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1291 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = job;
-#line 1291 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1291 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = _tmp10_->type;
-#line 1291 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1291 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp11_ != SCAN_TYPE_SINGLE) {
 #line 11251 "scanner.c"
 		gint _tmp12_ = 0;
@@ -11262,35 +11262,35 @@ static void scanner_do_complete_page (Scanner* self) {
 		gint _tmp14_ = 0;
 		NotifyPageDone* _tmp15_ = NULL;
 		NotifyPageDone* _tmp16_ = NULL;
-#line 1293 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = self->priv->page_number;
-#line 1293 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->page_number = _tmp12_ + 1;
-#line 1294 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->pass_number = 0;
-#line 1295 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp13_ = job;
-#line 1295 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = _tmp13_->id;
-#line 1295 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = notify_page_done_new (_tmp14_);
-#line 1295 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = _tmp15_;
-#line 1295 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp16_);
-#line 1295 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp16_);
-#line 1296 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_START;
-#line 1297 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1297 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 11281 "scanner.c"
 	}
-#line 1300 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_do_complete_document (self);
-#line 1276 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
 #line 11287 "scanner.c"
 }
@@ -11331,197 +11331,197 @@ static void scanner_do_read (Scanner* self) {
 	gint _tmp40_ = 0;
 	SANE_Parameters _tmp41_ = {0};
 	gint _tmp42_ = 0;
-#line 1303 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1305 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->job_queue;
-#line 1305 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = _tmp0_->data;
-#line 1305 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = _scan_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST ((ScanJob*) _tmp1_, TYPE_SCAN_JOB, ScanJob));
-#line 1305 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	job = _tmp2_;
-#line 1308 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = self->priv->buffer;
-#line 1308 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3__length1 = self->priv->buffer_length1;
-#line 1308 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = self->priv->n_used;
-#line 1308 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	n_to_read = _tmp3__length1 - _tmp4_;
-#line 1311 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1311 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = self->priv->buffer;
-#line 1311 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1311 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5__length1 = self->priv->buffer_length1;
-#line 1311 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1311 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	b = (guchar*) _tmp5_;
-#line 1312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = self->priv->handle;
-#line 1312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = b;
-#line 1312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = self->priv->n_used;
-#line 1312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = n_to_read;
-#line 1312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = sane_read (_tmp6_, (guint8*) (_tmp7_ + _tmp8_), (SANE_Int) _tmp9_, &_tmp10_);
-#line 1312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	n_read = _tmp10_;
-#line 1312 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp11_;
-#line 1313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = n_to_read;
-#line 1313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = status;
-#line 1313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = sane_status_to_string (_tmp13_);
-#line 1313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = _tmp14_;
-#line 1313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = n_read;
-#line 1313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1313: sane_read (%d) -> (%s, %d)", _tmp12_, _tmp15_, (gint) _tmp16_);
-#line 1313 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp15_);
-#line 1316 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = status;
-#line 1316 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp17_ == SANE_STATUS_EOF) {
 #line 11382 "scanner.c"
 		gboolean _tmp18_ = FALSE;
 		SANE_Parameters _tmp19_ = {0};
 		gint _tmp20_ = 0;
 		gint _tmp27_ = 0;
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = self->priv->parameters;
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp20_ = _tmp19_.lines;
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ > 0) {
 #line 11393 "scanner.c"
 			gint _tmp21_ = 0;
 			SANE_Parameters _tmp22_ = {0};
 			gint _tmp23_ = 0;
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = self->priv->line_count;
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp22_ = self->priv->parameters;
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = _tmp22_.lines;
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = _tmp21_ != _tmp23_;
 #line 11405 "scanner.c"
 		} else {
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = FALSE;
 #line 11409 "scanner.c"
 		}
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp18_) {
 #line 11413 "scanner.c"
 			gint _tmp24_ = 0;
 			SANE_Parameters _tmp25_ = {0};
 			gint _tmp26_ = 0;
-#line 1319 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp24_ = self->priv->line_count;
-#line 1319 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp25_ = self->priv->parameters;
-#line 1319 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp26_ = _tmp25_.lines;
-#line 1319 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:1319: Scan completed with %d lines, expected %d lines", _tmp24_, _tmp26_);
 #line 11425 "scanner.c"
 		}
-#line 1320 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp27_ = self->priv->n_used;
-#line 1320 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp27_ > 0) {
 #line 11431 "scanner.c"
 			gint _tmp28_ = 0;
-#line 1321 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = self->priv->n_used;
-#line 1321 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:1321: Scan complete with %d bytes of unused data", _tmp28_);
 #line 11437 "scanner.c"
 		}
-#line 1322 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_do_complete_page (self);
-#line 1323 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1323 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1323 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1323 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 11445 "scanner.c"
 	}
-#line 1327 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = status;
-#line 1327 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp29_ != SANE_STATUS_GOOD) {
 #line 11451 "scanner.c"
 		SANE_Status _tmp30_ = 0;
 		const gchar* _tmp31_ = NULL;
 		SANE_Status _tmp32_ = 0;
 		const gchar* _tmp33_ = NULL;
-#line 1329 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp30_ = status;
-#line 1329 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp31_ = sane_strstatus (_tmp30_);
-#line 1329 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:1329: Unable to read frame from device: %s", _tmp31_);
-#line 1330 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp32_ = status;
-#line 1330 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp33_ = _ ("Error communicating with scanner");
-#line 1330 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_fail_scan (self, (gint) _tmp32_, _tmp33_);
-#line 1333 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
-#line 1333 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 11472 "scanner.c"
 	}
-#line 1336 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	full_read = FALSE;
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = self->priv->n_used;
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp35_ == 0) {
 #line 11480 "scanner.c"
 		SANE_Int _tmp36_ = {0};
 		guchar* _tmp37_ = NULL;
 		gint _tmp37__length1 = 0;
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp36_ = n_read;
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp37_ = self->priv->buffer;
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp37__length1 = self->priv->buffer_length1;
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = _tmp36_ == ((SANE_Int) _tmp37__length1);
 #line 11492 "scanner.c"
 	} else {
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = FALSE;
 #line 11496 "scanner.c"
 	}
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp34_) {
-#line 1338 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		full_read = TRUE;
 #line 11502 "scanner.c"
 	}
-#line 1339 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = self->priv->n_used;
-#line 1339 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = n_read;
-#line 1339 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->n_used = _tmp38_ + ((gint) _tmp39_);
-#line 1342 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_ = self->priv->n_used;
-#line 1342 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = self->priv->parameters;
-#line 1342 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = _tmp41_.bytes_per_line;
-#line 1342 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp40_ >= _tmp42_) {
 #line 11518 "scanner.c"
 		ScanLine* line = NULL;
@@ -11572,213 +11572,213 @@ static void scanner_do_read (Scanner* self) {
 		ScanLine* _tmp155_ = NULL;
 		NotifyGotLine* _tmp156_ = NULL;
 		NotifyGotLine* _tmp157_ = NULL;
-#line 1344 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1344 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp43_ = scan_line_new ();
-#line 1344 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1344 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		line = _tmp43_;
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp44_ = self->priv->parameters;
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp45_ = _tmp44_.format;
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		switch (_tmp45_) {
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GRAY:
 #line 11579 "scanner.c"
 			{
 				ScanLine* _tmp46_ = NULL;
-#line 1348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp46_ = line;
-#line 1348 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp46_->channel = 0;
-#line 1349 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 11588 "scanner.c"
 			}
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RGB:
 #line 11592 "scanner.c"
 			{
 				ScanLine* _tmp47_ = NULL;
-#line 1351 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp47_ = line;
-#line 1351 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp47_->channel = -1;
-#line 1352 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 11601 "scanner.c"
 			}
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RED:
 #line 11605 "scanner.c"
 			{
 				ScanLine* _tmp48_ = NULL;
-#line 1354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp48_ = line;
-#line 1354 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp48_->channel = 0;
-#line 1355 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 11614 "scanner.c"
 			}
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GREEN:
 #line 11618 "scanner.c"
 			{
 				ScanLine* _tmp49_ = NULL;
-#line 1357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp49_ = line;
-#line 1357 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp49_->channel = 1;
-#line 1358 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 11627 "scanner.c"
 			}
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_BLUE:
 #line 11631 "scanner.c"
 			{
 				ScanLine* _tmp50_ = NULL;
-#line 1360 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp50_ = line;
-#line 1360 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp50_->channel = 2;
-#line 1361 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 11640 "scanner.c"
 			}
 			default:
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 11645 "scanner.c"
 		}
-#line 1363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp51_ = line;
-#line 1363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp52_ = self->priv->parameters;
-#line 1363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = _tmp52_.pixels_per_line;
-#line 1363 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp51_->width = _tmp53_;
-#line 1364 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp54_ = line;
-#line 1364 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp55_ = self->priv->parameters;
-#line 1364 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp56_ = _tmp55_.depth;
-#line 1364 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp54_->depth = _tmp56_;
-#line 1365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_ = line;
-#line 1365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp58_ = self->priv->buffer;
-#line 1365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp58__length1 = self->priv->buffer_length1;
-#line 1365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = NULL;
-#line 1365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer_length1 = 0;
-#line 1365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_->data = (g_free (_tmp57_->data), NULL);
-#line 1365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_->data = _tmp58_;
-#line 1365 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp57_->data_length1 = _tmp58__length1;
-#line 1366 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_ = line;
-#line 1366 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp60_ = self->priv->parameters;
-#line 1366 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp61_ = _tmp60_.bytes_per_line;
-#line 1366 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp59_->data_length = _tmp61_;
-#line 1367 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp62_ = line;
-#line 1367 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp63_ = self->priv->line_count;
-#line 1367 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp62_->number = _tmp63_;
-#line 1368 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp64_ = line;
-#line 1368 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp65_ = self->priv->n_used;
-#line 1368 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp66_ = line;
-#line 1368 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp67_ = _tmp66_->data_length;
-#line 1368 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1368 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp64_->n_lines = _tmp65_ / _tmp67_;
-#line 1370 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp68_ = self->priv->line_count;
-#line 1370 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp69_ = line;
-#line 1370 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp70_ = _tmp69_->n_lines;
-#line 1370 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->line_count = _tmp68_ + _tmp70_;
-#line 1373 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp71_ = line;
-#line 1373 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp72_ = _tmp71_->data;
-#line 1373 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp72__length1 = _tmp71_->data_length1;
-#line 1373 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1373 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		buffer_size = _tmp72__length1;
-#line 1374 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp73_ = full_read;
-#line 1374 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp73_) {
 #line 11723 "scanner.c"
 			gint _tmp74_ = 0;
 			SANE_Parameters _tmp75_ = {0};
 			gint _tmp76_ = 0;
-#line 1375 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp74_ = buffer_size;
-#line 1375 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp75_ = self->priv->parameters;
-#line 1375 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp76_ = _tmp75_.bytes_per_line;
-#line 1375 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			buffer_size = _tmp74_ + _tmp76_;
 #line 11735 "scanner.c"
 		}
-#line 1377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp77_ = buffer_size;
-#line 1377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp78_ = g_new0 (guchar, _tmp77_);
-#line 1377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 1377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = _tmp78_;
-#line 1377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer_length1 = _tmp77_;
-#line 1377 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->_buffer_size_ = self->priv->buffer_length1;
-#line 1378 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp79_ = self->priv->n_used;
-#line 1378 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp80_ = line;
-#line 1378 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp81_ = _tmp80_->n_lines;
-#line 1378 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp82_ = line;
-#line 1378 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp83_ = _tmp82_->data_length;
-#line 1378 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		n_remaining = _tmp79_ - (_tmp81_ * _tmp83_);
-#line 1379 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->n_used = 0;
 #line 11763 "scanner.c"
 		{
 			gint i = 0;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			i = 0;
 #line 11768 "scanner.c"
 			{
 				gboolean _tmp84_ = FALSE;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp84_ = TRUE;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				while (TRUE) {
 #line 11775 "scanner.c"
 					gint _tmp86_ = 0;
@@ -11797,120 +11797,120 @@ static void scanner_do_read (Scanner* self) {
 					guchar _tmp97_ = '\0';
 					guchar _tmp98_ = '\0';
 					gint _tmp99_ = 0;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp84_) {
 #line 11794 "scanner.c"
 						gint _tmp85_ = 0;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp85_ = i;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						i = _tmp85_ + 1;
 #line 11800 "scanner.c"
 					}
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp84_ = FALSE;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp86_ = i;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp87_ = n_remaining;
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!(_tmp86_ < _tmp87_)) {
-#line 1380 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						break;
 #line 11812 "scanner.c"
 					}
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88_ = self->priv->buffer;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88__length1 = self->priv->buffer_length1;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp89_ = i;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp90_ = line;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp91_ = _tmp90_->data;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp91__length1 = _tmp90_->data_length1;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp92_ = i;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp93_ = line;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp94_ = _tmp93_->n_lines;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp95_ = line;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp96_ = _tmp95_->data_length;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp97_ = _tmp91_[_tmp92_ + (_tmp94_ * _tmp96_)];
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88_[_tmp89_] = _tmp97_;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp98_ = _tmp88_[_tmp89_];
-#line 1383 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp99_ = self->priv->n_used;
-#line 1383 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->n_used = _tmp99_ + 1;
 #line 11846 "scanner.c"
 				}
 			}
 		}
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp103_ = self->priv->parameters;
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp104_ = _tmp103_.depth;
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp104_ == 8) {
 #line 11856 "scanner.c"
 			SANE_Parameters _tmp105_ = {0};
 			SANE_Frame _tmp106_ = 0;
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp105_ = self->priv->parameters;
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp106_ = _tmp105_.format;
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = _tmp106_ == SANE_FRAME_GRAY;
 #line 11865 "scanner.c"
 		} else {
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = FALSE;
 #line 11869 "scanner.c"
 		}
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp102_) {
 #line 11873 "scanner.c"
 			ScanJob* _tmp107_ = NULL;
 			gint _tmp108_ = 0;
-#line 1389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp107_ = job;
-#line 1389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp108_ = _tmp107_->depth;
-#line 1389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp101_ = _tmp108_ == 2;
 #line 11882 "scanner.c"
 		} else {
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp101_ = FALSE;
 #line 11886 "scanner.c"
 		}
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp101_) {
 #line 11890 "scanner.c"
 			ScanJob* _tmp109_ = NULL;
 			ScanMode _tmp110_ = 0;
-#line 1389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp109_ = job;
-#line 1389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp110_ = _tmp109_->scan_mode;
-#line 1389 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp100_ = _tmp110_ == SCAN_MODE_GRAY;
 #line 11899 "scanner.c"
 		} else {
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp100_ = FALSE;
 #line 11903 "scanner.c"
 		}
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp100_) {
 #line 11907 "scanner.c"
 			guchar block = '\0';
@@ -11919,23 +11919,23 @@ static void scanner_do_read (Scanner* self) {
 			ScanLine* _tmp150_ = NULL;
 			ScanLine* _tmp151_ = NULL;
 			gint _tmp152_ = 0;
-#line 1391 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			block = (guchar) 0;
-#line 1392 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			write_offset = 0;
-#line 1393 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			block_shift = 6;
 #line 11920 "scanner.c"
 			{
 				gint i = 0;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
 #line 11925 "scanner.c"
 				{
 					gboolean _tmp111_ = FALSE;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp111_ = TRUE;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
 #line 11932 "scanner.c"
 						gint _tmp113_ = 0;
@@ -11946,49 +11946,49 @@ static void scanner_do_read (Scanner* self) {
 						ScanLine* _tmp117_ = NULL;
 						gint _tmp118_ = 0;
 						gint _tmp143_ = 0;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp111_) {
 #line 11943 "scanner.c"
 							gint _tmp112_ = 0;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp112_ = i;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp112_ + 1;
 #line 11949 "scanner.c"
 						}
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp111_ = FALSE;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp113_ = i;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp114_ = line;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp115_ = _tmp114_->n_lines;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!(_tmp113_ < _tmp115_)) {
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
 #line 11963 "scanner.c"
 						}
-#line 1396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp116_ = i;
-#line 1396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp117_ = line;
-#line 1396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp118_ = _tmp117_->data_length;
-#line 1396 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						offset = _tmp116_ * _tmp118_;
 #line 11973 "scanner.c"
 						{
 							gint x = 0;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							x = 0;
 #line 11978 "scanner.c"
 							{
 								gboolean _tmp119_ = FALSE;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								_tmp119_ = TRUE;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								while (TRUE) {
 #line 11985 "scanner.c"
 									gint _tmp121_ = 0;
@@ -12007,87 +12007,87 @@ static void scanner_do_read (Scanner* self) {
 									guchar _tmp133_ = '\0';
 									gint _tmp134_ = 0;
 									gint _tmp135_ = 0;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (!_tmp119_) {
 #line 12004 "scanner.c"
 										gint _tmp120_ = 0;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp120_ = x;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										x = _tmp120_ + 1;
 #line 12010 "scanner.c"
 									}
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp119_ = FALSE;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp121_ = x;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp122_ = line;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp123_ = _tmp122_->width;
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (!(_tmp121_ < _tmp123_)) {
-#line 1397 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										break;
 #line 12024 "scanner.c"
 									}
-#line 1399 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp124_ = line;
-#line 1399 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp125_ = _tmp124_->data;
-#line 1399 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp125__length1 = _tmp124_->data_length1;
-#line 1399 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp126_ = offset;
-#line 1399 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp127_ = x;
-#line 1399 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp128_ = _tmp125_[_tmp126_ + _tmp127_];
-#line 1399 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									p = _tmp128_;
-#line 1402 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp129_ = p;
-#line 1402 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (((gint) _tmp129_) >= 192) {
-#line 1403 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										sample = (guchar) 3;
 #line 12046 "scanner.c"
 									} else {
 										guchar _tmp130_ = '\0';
-#line 1404 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp130_ = p;
-#line 1404 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										if (((gint) _tmp130_) >= 128) {
-#line 1405 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1405 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											sample = (guchar) 2;
 #line 12055 "scanner.c"
 										} else {
 											guchar _tmp131_ = '\0';
-#line 1406 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1406 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											_tmp131_ = p;
-#line 1406 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1406 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											if (((gint) _tmp131_) >= 64) {
-#line 1407 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 1;
 #line 12064 "scanner.c"
 											} else {
-#line 1409 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 0;
 #line 12068 "scanner.c"
 											}
 										}
 									}
-#line 1411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp132_ = block;
-#line 1411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp133_ = sample;
-#line 1411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp134_ = block_shift;
-#line 1411 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									block = _tmp132_ | (_tmp133_ << _tmp134_);
-#line 1412 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp135_ = block_shift;
-#line 1412 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (_tmp135_ == 0) {
 #line 12084 "scanner.c"
 										ScanLine* _tmp136_ = NULL;
@@ -12097,43 +12097,43 @@ static void scanner_do_read (Scanner* self) {
 										guchar _tmp139_ = '\0';
 										guchar _tmp140_ = '\0';
 										gint _tmp141_ = 0;
-#line 1414 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp136_ = line;
-#line 1414 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp137_ = _tmp136_->data;
-#line 1414 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp137__length1 = _tmp136_->data_length1;
-#line 1414 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp138_ = write_offset;
-#line 1414 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp139_ = block;
-#line 1414 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp137_[_tmp138_] = _tmp139_;
-#line 1414 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp140_ = _tmp137_[_tmp138_];
-#line 1415 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp141_ = write_offset;
-#line 1415 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										write_offset = _tmp141_ + 1;
-#line 1416 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block = (guchar) 0;
-#line 1417 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = 6;
 #line 12114 "scanner.c"
 									} else {
 										gint _tmp142_ = 0;
-#line 1420 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp142_ = block_shift;
-#line 1420 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = _tmp142_ - 2;
 #line 12121 "scanner.c"
 									}
 								}
 							}
 						}
-#line 1424 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp143_ = block_shift;
-#line 1424 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp143_ != 6) {
 #line 12130 "scanner.c"
 							ScanLine* _tmp144_ = NULL;
@@ -12143,69 +12143,69 @@ static void scanner_do_read (Scanner* self) {
 							guchar _tmp147_ = '\0';
 							guchar _tmp148_ = '\0';
 							gint _tmp149_ = 0;
-#line 1426 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp144_ = line;
-#line 1426 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp145_ = _tmp144_->data;
-#line 1426 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp145__length1 = _tmp144_->data_length1;
-#line 1426 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp146_ = write_offset;
-#line 1426 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp147_ = block;
-#line 1426 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp145_[_tmp146_] = _tmp147_;
-#line 1426 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp148_ = _tmp145_[_tmp146_];
-#line 1427 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp149_ = write_offset;
-#line 1427 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1427 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							write_offset = _tmp149_ + 1;
-#line 1428 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							block = (guchar) 0;
-#line 1429 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1429 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							block_shift = 6;
 #line 12160 "scanner.c"
 						}
 					}
 				}
 			}
-#line 1433 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp150_ = line;
-#line 1433 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp151_ = line;
-#line 1433 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp152_ = _tmp151_->width;
-#line 1433 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp150_->data_length = ((_tmp152_ * 2) + 7) / 8;
 #line 12173 "scanner.c"
 		}
-#line 1436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp153_ = job;
-#line 1436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp154_ = _tmp153_->id;
-#line 1436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp155_ = line;
-#line 1436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp156_ = notify_got_line_new (_tmp154_, _tmp155_);
-#line 1436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp157_ = _tmp156_;
-#line 1436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_notify (self, (Notify*) _tmp157_);
-#line 1436 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp157_);
-#line 1342 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_line_unref0 (line);
 #line 12191 "scanner.c"
 	}
-#line 1303 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
 #line 12195 "scanner.c"
 }
 
 
 static void _scanner_authorization_cb_sane_authcallback (const gchar* resource, gchar* username, gchar* password) {
-#line 1445 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_authorization_cb (resource, username, -1, password, -1);
 #line 12202 "scanner.c"
 }
@@ -12227,166 +12227,166 @@ static void* scanner_scan_thread (Scanner* self) {
 	gint _tmp11_ = 0;
 	SANE_Int _tmp12_ = {0};
 	gint _tmp13_ = 0;
-#line 1440 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1442 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
-#line 1445 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = sane_init (&_tmp0_, _scanner_authorization_cb_sane_authcallback);
-#line 1445 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	version_code = _tmp0_;
-#line 1445 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	status = _tmp1_;
-#line 1446 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = status;
-#line 1446 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = sane_status_to_string (_tmp2_);
-#line 1446 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_;
-#line 1446 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1446: sane_init () -> %s", _tmp4_);
-#line 1446 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp4_);
-#line 1447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = status;
-#line 1447 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
 #line 12246 "scanner.c"
 		SANE_Status _tmp6_ = 0;
 		const gchar* _tmp7_ = NULL;
-#line 1449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = status;
-#line 1449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = sane_strstatus (_tmp6_);
-#line 1449 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:1449: Unable to initialize SANE backend: %s", _tmp7_);
-#line 1450 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		result = NULL;
-#line 1450 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
 #line 12259 "scanner.c"
 	}
-#line 1452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = version_code;
-#line 1452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = SANE_VERSION_MAJOR (_tmp8_);
-#line 1452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = version_code;
-#line 1452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = SANE_VERSION_MINOR (_tmp10_);
-#line 1452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = version_code;
-#line 1452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = SANE_VERSION_BUILD (_tmp12_);
-#line 1452 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1452: SANE version %d.%d.%d", _tmp9_, _tmp11_, _tmp13_);
-#line 1458 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_redetect (self);
-#line 1460 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
 #line 12279 "scanner.c"
 		gboolean _tmp14_ = FALSE;
 		ScanState _tmp15_ = 0;
-#line 1460 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = scanner_handle_requests (self);
-#line 1460 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (!_tmp14_) {
-#line 1460 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 12288 "scanner.c"
 		}
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = self->priv->state;
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		switch (_tmp15_) {
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_IDLE:
 #line 12296 "scanner.c"
 			{
 				GList* _tmp16_ = NULL;
-#line 1465 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_ = self->priv->job_queue;
-#line 1465 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp16_ != NULL) {
-#line 1467 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_set_scanning (self, TRUE);
-#line 1468 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1468 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->state = SCAN_STATE_OPEN;
 #line 12307 "scanner.c"
 				}
-#line 1470 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1470 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 12311 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_REDETECT:
 #line 12315 "scanner.c"
 			{
-#line 1472 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_redetect (self);
-#line 1473 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 12321 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_OPEN:
 #line 12325 "scanner.c"
 			{
-#line 1475 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_open (self);
-#line 1476 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 12331 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_OPTION:
 #line 12335 "scanner.c"
 			{
-#line 1478 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_option (self);
-#line 1479 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 12341 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_START:
 #line 12345 "scanner.c"
 			{
-#line 1481 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_start (self);
-#line 1482 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 12351 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_PARAMETERS:
 #line 12355 "scanner.c"
 			{
-#line 1484 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_parameters (self);
-#line 1485 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 12361 "scanner.c"
 			}
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_READ:
 #line 12365 "scanner.c"
 			{
-#line 1487 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1487 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_read (self);
-#line 1488 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
 #line 12371 "scanner.c"
 			}
 			default:
-#line 1462 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
 #line 12376 "scanner.c"
 		}
 	}
-#line 1492 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = NULL;
-#line 1492 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 12383 "scanner.c"
 }
@@ -12395,9 +12395,9 @@ static void* scanner_scan_thread (Scanner* self) {
 static gpointer _scanner_scan_thread_gthread_func (gpointer self) {
 	gpointer result;
 	result = scanner_scan_thread ((Scanner*) self);
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_unref (self);
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 12394 "scanner.c"
 }
@@ -12405,31 +12405,31 @@ static gpointer _scanner_scan_thread_gthread_func (gpointer self) {
 
 void scanner_start (Scanner* self) {
 	GError * _inner_error_ = NULL;
-#line 1495 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1495 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 12402 "scanner.c"
 	{
 		GThread* _tmp0_ = NULL;
 		GThread* _tmp1_ = NULL;
 		GThread* _tmp2_ = NULL;
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = g_thread_try_new ("scan-thread", _scanner_scan_thread_gthread_func, scanner_ref (self), &_inner_error_);
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp1_;
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12413 "scanner.c"
 			goto __catch15_g_error;
 		}
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = _tmp0_;
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = NULL;
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (self->priv->thread);
-#line 1499 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->thread = _tmp2_;
-#line 1497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (_tmp0_);
 #line 12426 "scanner.c"
 	}
@@ -12439,28 +12439,28 @@ void scanner_start (Scanner* self) {
 		GError* e = NULL;
 		GError* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
-#line 1497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		e = _inner_error_;
-#line 1497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_inner_error_ = NULL;
-#line 1503 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1503 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = e;
-#line 1503 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1503 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = _tmp3_->message;
-#line 1503 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1503 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_critical ("scanner.vala:1503: Unable to create thread: %s", _tmp4_);
-#line 1497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_error_free0 (e);
 #line 12446 "scanner.c"
 	}
 	__finally15:
-#line 1497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_clear_error (&_inner_error_);
-#line 1497 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 12457 "scanner.c"
 	}
@@ -12471,25 +12471,25 @@ void scanner_redetect (Scanner* self) {
 	gboolean _tmp0_ = FALSE;
 	GAsyncQueue* _tmp1_ = NULL;
 	RequestRedetect* _tmp2_ = NULL;
-#line 1507 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1509 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->need_redetect;
-#line 1509 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 1510 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
 #line 12474 "scanner.c"
 	}
-#line 1511 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->need_redetect = TRUE;
-#line 1513 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1513 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1513: Requesting redetection of scan devices");
-#line 1515 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->request_queue;
-#line 1515 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = request_redetect_new ();
-#line 1515 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
 #line 12486 "scanner.c"
 }
@@ -12498,13 +12498,13 @@ void scanner_redetect (Scanner* self) {
 gboolean scanner_is_scanning (Scanner* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1518 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1518 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1520 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->scanning;
-#line 1520 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = _tmp0_;
-#line 1520 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
 #line 12501 "scanner.c"
 }
@@ -12513,61 +12513,61 @@ gboolean scanner_is_scanning (Scanner* self) {
 static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 	gchar* result = NULL;
 	ScanMode _tmp0_ = 0;
-#line 1523 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1523 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1525 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = mode;
-#line 1525 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp0_) {
-#line 1525 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_DEFAULT:
 #line 12516 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 1528 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp1_ = g_strdup ("ScanMode.DEFAULT");
-#line 1528 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp1_;
-#line 1528 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12525 "scanner.c"
 		}
-#line 1525 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_COLOR:
 #line 12529 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 1530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp2_ = g_strdup ("ScanMode.COLOR");
-#line 1530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp2_;
-#line 1530 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12538 "scanner.c"
 		}
-#line 1525 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_GRAY:
 #line 12542 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 1532 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = g_strdup ("ScanMode.GRAY");
-#line 1532 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp3_;
-#line 1532 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12551 "scanner.c"
 		}
-#line 1525 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_LINEART:
 #line 12555 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
-#line 1534 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = g_strdup ("ScanMode.LINEART");
-#line 1534 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp4_;
-#line 1534 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12564 "scanner.c"
 		}
@@ -12575,13 +12575,13 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 		{
 			ScanMode _tmp5_ = 0;
 			gchar* _tmp6_ = NULL;
-#line 1536 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = mode;
-#line 1536 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = g_strdup_printf ("%d", (gint) _tmp5_);
-#line 1536 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp6_;
-#line 1536 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12578 "scanner.c"
 		}
@@ -12592,61 +12592,61 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 	gchar* result = NULL;
 	ScanType _tmp0_ = 0;
-#line 1540 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = type;
-#line 1542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	switch (_tmp0_) {
-#line 1542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_SINGLE:
 #line 12595 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 1545 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp1_ = g_strdup ("ScanType.SINGLE");
-#line 1545 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp1_;
-#line 1545 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12604 "scanner.c"
 		}
-#line 1542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_FRONT:
 #line 12608 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 1547 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp2_ = g_strdup ("ScanType.ADF_FRONT");
-#line 1547 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp2_;
-#line 1547 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12617 "scanner.c"
 		}
-#line 1542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BACK:
 #line 12621 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 1549 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = g_strdup ("ScanType.ADF_BACK");
-#line 1549 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp3_;
-#line 1549 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12630 "scanner.c"
 		}
-#line 1542 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BOTH:
 #line 12634 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
-#line 1551 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = g_strdup ("ScanType.ADF_BOTH");
-#line 1551 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp4_;
-#line 1551 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12643 "scanner.c"
 		}
@@ -12654,13 +12654,13 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 		{
 			ScanType _tmp5_ = 0;
 			gchar* _tmp6_ = NULL;
-#line 1553 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp5_ = type;
-#line 1553 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = g_strdup_printf ("%d", (gint) _tmp5_);
-#line 1553 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = _tmp6_;
-#line 1553 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
 #line 12657 "scanner.c"
 		}
@@ -12725,173 +12725,173 @@ void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options) {
 	gint _tmp53_ = 0;
 	GAsyncQueue* _tmp54_ = NULL;
 	Request* _tmp55_ = NULL;
-#line 1557 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1557 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (options != NULL);
-#line 1560 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = device;
-#line 1560 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ != NULL) {
 #line 12728 "scanner.c"
 		const gchar* _tmp2_ = NULL;
-#line 1560 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = device;
-#line 1560 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
 #line 12734 "scanner.c"
 	} else {
-#line 1560 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = "(null)";
 #line 12738 "scanner.c"
 	}
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = _tmp3_->dpi;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp5_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp6_ = _tmp5_->scan_mode;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp7_ = scanner_get_scan_mode_string (self, _tmp6_);
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = _tmp7_;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp9_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = _tmp9_->depth;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp12_ = _tmp11_->type;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = scanner_get_scan_type_string (self, _tmp12_);
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = _tmp13_;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp15_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp16_ = _tmp15_->paper_width;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = _tmp17_->paper_height;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp19_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = _tmp19_->brightness;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp21_ = options;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp22_ = _tmp21_->contrast;
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1559: Scanner.scan (\"%s\", dpi=%d, scan_mode=%s, depth=%" \
 "d, type=%s, paper_width=%d, paper_height=%d, brightness=%d, contrast=%" \
 "d)", _tmp0_, _tmp4_, _tmp8_, _tmp10_, _tmp14_, _tmp16_, _tmp18_, _tmp20_, _tmp22_);
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp14_);
-#line 1559 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp8_);
-#line 1563 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp23_ = request_start_scan_new ();
-#line 1563 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request = _tmp23_;
-#line 1564 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp24_ = scan_job_new ();
-#line 1564 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (request->job);
-#line 1564 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request->job = _tmp24_;
-#line 1565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_ = request->job;
-#line 1565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp26_ = self->job_id;
-#line 1565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->job_id = _tmp26_ + 1;
-#line 1565 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp25_->id = _tmp26_;
-#line 1566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_ = request->job;
-#line 1566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp28_ = device;
-#line 1566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = g_strdup (_tmp28_);
-#line 1566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp27_->device);
-#line 1566 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp27_->device = _tmp29_;
-#line 1567 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_ = request->job;
-#line 1567 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp31_ = options;
-#line 1567 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp32_ = _tmp31_->dpi;
-#line 1567 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp30_->dpi = (gdouble) _tmp32_;
-#line 1568 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_ = request->job;
-#line 1568 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp34_ = options;
-#line 1568 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp35_ = _tmp34_->scan_mode;
-#line 1568 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp33_->scan_mode = _tmp35_;
-#line 1569 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_ = request->job;
-#line 1569 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp37_ = options;
-#line 1569 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = _tmp37_->depth;
-#line 1569 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp36_->depth = _tmp38_;
-#line 1570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_ = request->job;
-#line 1570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp40_ = options;
-#line 1570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp41_ = _tmp40_->type;
-#line 1570 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp39_->type = _tmp41_;
-#line 1571 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_ = request->job;
-#line 1571 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp43_ = options;
-#line 1571 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp44_ = _tmp43_->paper_width;
-#line 1571 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp42_->page_width = _tmp44_;
-#line 1572 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp45_ = request->job;
-#line 1572 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp46_ = options;
-#line 1572 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp47_ = _tmp46_->paper_height;
-#line 1572 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp45_->page_height = _tmp47_;
-#line 1573 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp48_ = request->job;
-#line 1573 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp49_ = options;
-#line 1573 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp50_ = _tmp49_->brightness;
-#line 1573 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp48_->brightness = _tmp50_;
-#line 1574 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp51_ = request->job;
-#line 1574 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp52_ = options;
-#line 1574 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp53_ = _tmp52_->contrast;
-#line 1574 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp51_->contrast = _tmp53_;
-#line 1575 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp54_ = self->priv->request_queue;
-#line 1575 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp55_ = _request_ref0 ((Request*) request);
-#line 1575 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp54_, _tmp55_);
-#line 1557 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_request_unref0 (request);
 #line 12886 "scanner.c"
 }
@@ -12901,24 +12901,24 @@ void scanner_cancel (Scanner* self) {
 	gint _tmp0_ = 0;
 	GAsyncQueue* _tmp1_ = NULL;
 	RequestCancel* _tmp2_ = NULL;
-#line 1578 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1580 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->job_id;
-#line 1580 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->first_job_id = _tmp0_;
-#line 1581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = self->priv->request_queue;
-#line 1581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = request_cancel_new ();
-#line 1581 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
 #line 12906 "scanner.c"
 }
 
 
 static gpointer _g_thread_ref0 (gpointer self) {
-#line 1592 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? g_thread_ref (self) : NULL;
 #line 12913 "scanner.c"
 }
@@ -12928,38 +12928,38 @@ void scanner_free (Scanner* self) {
 	GAsyncQueue* _tmp0_ = NULL;
 	RequestQuit* _tmp1_ = NULL;
 	GThread* _tmp2_ = NULL;
-#line 1584 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1584 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 1586 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1586: Stopping scan thread");
-#line 1588 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp0_ = self->priv->request_queue;
-#line 1588 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp1_ = request_quit_new ();
-#line 1588 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp0_, (Request*) _tmp1_);
-#line 1590 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->thread;
-#line 1590 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_ != NULL) {
 #line 12935 "scanner.c"
 		GThread* _tmp3_ = NULL;
 		GThread* _tmp4_ = NULL;
-#line 1592 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = self->priv->thread;
-#line 1592 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = _g_thread_ref0 (_tmp3_);
-#line 1592 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_thread_join (_tmp4_);
-#line 1593 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (self->priv->thread);
-#line 1593 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->thread = NULL;
 #line 12948 "scanner.c"
 	}
-#line 1596 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	sane_exit ();
-#line 1597 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1597: sane_exit ()");
 #line 12954 "scanner.c"
 }
@@ -12972,25 +12972,25 @@ static void g_cclosure_user_marshal_VOID__SCAN_PAGE_INFO (GClosure * closure, GV
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (n_param_values == 2);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = closure->data;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
 #line 12973 "scanner.c"
 	} else {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
 #line 12979 "scanner.c"
 	}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__SCAN_PAGE_INFO) (marshal_data ? marshal_data : cc->callback);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_page_info (param_values + 1), data2);
 #line 12985 "scanner.c"
 }
@@ -13003,25 +13003,25 @@ static void g_cclosure_user_marshal_VOID__SCAN_LINE (GClosure * closure, GValue
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (n_param_values == 2);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = closure->data;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
 #line 13004 "scanner.c"
 	} else {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
 #line 13010 "scanner.c"
 	}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__SCAN_LINE) (marshal_data ? marshal_data : cc->callback);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_line (param_values + 1), data2);
 #line 13016 "scanner.c"
 }
@@ -13034,41 +13034,41 @@ static void g_cclosure_user_marshal_VOID__INT_STRING (GClosure * closure, GValue
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = closure->data;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
 #line 13035 "scanner.c"
 	} else {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
 #line 13041 "scanner.c"
 	}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__INT_STRING) (marshal_data ? marshal_data : cc->callback);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_string (param_values + 2), data2);
 #line 13047 "scanner.c"
 }
 
 
 static void value_scanner_init (GValue* value) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
 #line 13054 "scanner.c"
 }
 
 
 static void value_scanner_free_value (GValue* value) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (value->data[0].v_pointer) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (value->data[0].v_pointer);
 #line 13063 "scanner.c"
 	}
@@ -13076,13 +13076,13 @@ static void value_scanner_free_value (GValue* value) {
 
 
 static void value_scanner_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (src_value->data[0].v_pointer) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scanner_ref (src_value->data[0].v_pointer);
 #line 13073 "scanner.c"
 	} else {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
 #line 13077 "scanner.c"
 	}
@@ -13090,37 +13090,37 @@ static void value_scanner_copy_value (const GValue* src_value, GValue* dest_valu
 
 
 static gpointer value_scanner_peek_pointer (const GValue* value) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 13085 "scanner.c"
 }
 
 
 static gchar* value_scanner_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
 #line 13092 "scanner.c"
 		Scanner* object;
 		object = collect_values[0].v_pointer;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 13099 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
 #line 13103 "scanner.c"
 		}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scanner_ref (object);
 #line 13107 "scanner.c"
 	} else {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 13111 "scanner.c"
 	}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 13115 "scanner.c"
 }
@@ -13129,27 +13129,27 @@ static gchar* value_scanner_collect_value (GValue* value, guint n_collect_values
 static gchar* value_scanner_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	Scanner** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!object_p) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
 #line 13126 "scanner.c"
 	}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
 #line 13132 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
 #line 13136 "scanner.c"
 	} else {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scanner_ref (value->data[0].v_pointer);
 #line 13140 "scanner.c"
 	}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
 #line 13144 "scanner.c"
 }
@@ -13157,22 +13157,22 @@ static gchar* value_scanner_lcopy_value (const GValue* value, guint n_collect_va
 
 GParamSpec* param_spec_scanner (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecScanner* spec;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SCANNER), NULL);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
 #line 13158 "scanner.c"
 }
 
 
 gpointer value_get_scanner (const GValue* value) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCANNER), NULL);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
 #line 13167 "scanner.c"
 }
@@ -13180,29 +13180,29 @@ gpointer value_get_scanner (const GValue* value) {
 
 void value_set_scanner (GValue* value, gpointer v_object) {
 	Scanner* old;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCANNER));
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCANNER));
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_ref (value->data[0].v_pointer);
 #line 13187 "scanner.c"
 	} else {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 13191 "scanner.c"
 	}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
 #line 13197 "scanner.c"
 	}
@@ -13211,27 +13211,27 @@ void value_set_scanner (GValue* value, gpointer v_object) {
 
 void value_take_scanner (GValue* value, gpointer v_object) {
 	Scanner* old;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCANNER));
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	old = value->data[0].v_pointer;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (v_object) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SCANNER));
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
 #line 13216 "scanner.c"
 	} else {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
 #line 13220 "scanner.c"
 	}
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
 #line 13226 "scanner.c"
 	}
@@ -13239,38 +13239,38 @@ void value_take_scanner (GValue* value, gpointer v_object) {
 
 
 static void scanner_class_init (ScannerClass * klass) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_parent_class = g_type_class_peek_parent (klass);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((ScannerClass *) klass)->finalize = scanner_finalize;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_type_class_add_private (klass, sizeof (ScannerPrivate));
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("update_devices", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("request_authorization", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("expect_page", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("got_page_info", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SCAN_PAGE_INFO, G_TYPE_NONE, 1, TYPE_SCAN_PAGE_INFO);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("got_line", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SCAN_LINE, G_TYPE_NONE, 1, TYPE_SCAN_LINE);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("scan_failed", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_STRING, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_STRING);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("page_done", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("document_done", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("scanning_changed", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 13256 "scanner.c"
 }
 
 
 static void scanner_instance_init (Scanner * self) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = SCANNER_GET_PRIVATE (self);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
 #line 13265 "scanner.c"
 }
@@ -13278,27 +13278,27 @@ static void scanner_instance_init (Scanner * self) {
 
 static void scanner_finalize (Scanner* obj) {
 	Scanner * self;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCANNER, Scanner);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
-#line 214 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_thread_unref0 (self->priv->thread);
-#line 217 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->request_queue);
-#line 220 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->notify_queue);
-#line 223 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_async_queue_unref0 (self->priv->authorize_queue);
-#line 229 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->default_device);
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_job_unref0_0 (self->priv->job_queue);
-#line 239 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_hash_table_unref0 (self->priv->options);
-#line 250 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
 #line 13293 "scanner.c"
 }
@@ -13321,9 +13321,9 @@ GType scanner_get_type (void) {
 gpointer scanner_ref (gpointer instance) {
 	Scanner* self;
 	self = instance;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
 #line 13318 "scanner.c"
 }
@@ -13332,11 +13332,11 @@ gpointer scanner_ref (gpointer instance) {
 void scanner_unref (gpointer instance) {
 	Scanner* self;
 	self = instance;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		SCANNER_GET_CLASS (self)->finalize (self);
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/scanner.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 13331 "scanner.c"
 	}
diff --git a/src/simple-scan.c b/src/simple-scan.c
index 879a623..f474954 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -400,7 +400,7 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 const GOptionEntry SIMPLE_SCAN_options[4] = {{"version", 'v', 0, G_OPTION_ARG_NONE, &simple_scan_show_version, "Show release version", NULL}, {"debug", 'd', 0, G_OPTION_ARG_NONE, &simple_scan_debug_enabled, "Print debugging messages", NULL}, {"fix-pdf", (gchar) 0, 0, G_OPTION_ARG_STRING, &simple_scan_fix_pdf_filename, "Fix PDF files generated with older versions of Simple Scan", "FILENAME..."}, {NULL}};
 
 static gpointer _scan_device_ref0 (gpointer self) {
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return self ? scan_device_ref (self) : NULL;
 #line 406 "simple-scan.c"
 }
@@ -410,138 +410,138 @@ SimpleScan* simple_scan_construct (GType object_type, ScanDevice* device) {
 	SimpleScan * self = NULL;
 	ScanDevice* _tmp0_ = NULL;
 	ScanDevice* _tmp1_ = NULL;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self = (SimpleScan*) g_object_new (object_type, NULL);
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = device;
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = _scan_device_ref0 (_tmp0_);
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_scan_device_unref0 (self->priv->default_device);
-#line 41 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 41 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->default_device = _tmp1_;
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return self;
 #line 426 "simple-scan.c"
 }
 
 
 SimpleScan* simple_scan_new (ScanDevice* device) {
-#line 39 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 39 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return simple_scan_construct (TYPE_SIMPLE_SCAN, device);
 #line 433 "simple-scan.c"
 }
 
 
 static gpointer _book_ref0 (gpointer self) {
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return self ? book_ref (self) : NULL;
 #line 440 "simple-scan.c"
 }
 
 
 static void _simple_scan_scan_cb_user_interface_start_scan (UserInterface* _sender, const gchar* device, ScanOptions* options, gpointer self) {
-#line 50 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scan_cb ((SimpleScan*) self, _sender, device, options);
 #line 447 "simple-scan.c"
 }
 
 
 static void _simple_scan_cancel_cb_user_interface_stop_scan (UserInterface* _sender, gpointer self) {
-#line 51 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_cancel_cb ((SimpleScan*) self, _sender);
 #line 454 "simple-scan.c"
 }
 
 
 static void _simple_scan_email_cb_user_interface_email (UserInterface* _sender, const gchar* profile, gint quality, gpointer self) {
-#line 52 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 52 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_email_cb ((SimpleScan*) self, _sender, profile, quality);
 #line 461 "simple-scan.c"
 }
 
 
 static void _simple_scan_update_scan_devices_cb_scanner_update_devices (Scanner* _sender, GList* devices, gpointer self) {
-#line 55 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 55 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_update_scan_devices_cb ((SimpleScan*) self, _sender, devices);
 #line 468 "simple-scan.c"
 }
 
 
 static void _simple_scan_authorize_cb_scanner_request_authorization (Scanner* _sender, const gchar* resource, gpointer self) {
-#line 56 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_authorize_cb ((SimpleScan*) self, _sender, resource);
 #line 475 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_new_page_cb_scanner_expect_page (Scanner* _sender, gpointer self) {
-#line 57 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_new_page_cb ((SimpleScan*) self, _sender);
 #line 482 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_page_info_cb_scanner_got_page_info (Scanner* _sender, ScanPageInfo* info, gpointer self) {
-#line 58 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 58 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_page_info_cb ((SimpleScan*) self, _sender, info);
 #line 489 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_line_cb_scanner_got_line (Scanner* _sender, ScanLine* line, gpointer self) {
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_line_cb ((SimpleScan*) self, _sender, line);
 #line 496 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_page_done_cb_scanner_page_done (Scanner* _sender, gpointer self) {
-#line 60 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 60 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_page_done_cb ((SimpleScan*) self, _sender);
 #line 503 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_document_done_cb_scanner_document_done (Scanner* _sender, gpointer self) {
-#line 61 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_document_done_cb ((SimpleScan*) self, _sender);
 #line 510 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_failed_cb_scanner_scan_failed (Scanner* _sender, gint error_code, const gchar* error_string, gpointer self) {
-#line 62 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_failed_cb ((SimpleScan*) self, _sender, error_code, error_string);
 #line 517 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed (Scanner* _sender, gpointer self) {
-#line 63 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_scanner_scanning_changed_cb ((SimpleScan*) self, _sender);
 #line 524 "simple-scan.c"
 }
 
 
 static void _simple_scan_on_uevent_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self) {
-#line 67 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_on_uevent ((SimpleScan*) self, _sender, action, device);
 #line 531 "simple-scan.c"
 }
 
 
 static void _scan_device_unref0_ (gpointer var) {
-#line 69 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	(var == NULL) ? NULL : (var = (scan_device_unref (var), NULL));
 #line 538 "simple-scan.c"
 }
 
 
 static void _g_list_free__scan_device_unref0_ (GList* self) {
-#line 69 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_list_foreach (self, (GFunc) _scan_device_unref0_, NULL);
-#line 69 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_list_free (self);
 #line 547 "simple-scan.c"
 }
@@ -577,115 +577,115 @@ static void simple_scan_real_startup (GApplication* base) {
 	GUdevClient* _tmp21_ = NULL;
 	GUdevClient* _tmp22_ = NULL;
 	ScanDevice* _tmp23_ = NULL;
-#line 44 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self = (SimpleScan*) base;
-#line 46 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 46 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_APPLICATION_CLASS (simple_scan_parent_class)->startup ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_get_type (), GtkApplication));
-#line 48 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = user_interface_new ();
-#line 48 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_object_ref_sink (_tmp0_);
-#line 48 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (self->priv->ui);
-#line 48 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->ui = _tmp0_;
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = self->priv->ui;
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = user_interface_get_book (_tmp1_);
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = _tmp2_;
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = _book_ref0 (_tmp3_);
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_book_unref0 (self->priv->book);
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->book = _tmp4_;
-#line 50 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp5_ = self->priv->ui;
-#line 50 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 50 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp5_, "start-scan", (GCallback) _simple_scan_scan_cb_user_interface_start_scan, self, 0);
-#line 51 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp6_ = self->priv->ui;
-#line 51 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp6_, "stop-scan", (GCallback) _simple_scan_cancel_cb_user_interface_stop_scan, self, 0);
-#line 52 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 52 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp7_ = self->priv->ui;
-#line 52 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 52 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp7_, "email", (GCallback) _simple_scan_email_cb_user_interface_email, self, 0);
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp8_ = scanner_get_instance ();
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_scanner_unref0 (self->priv->scanner);
-#line 54 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 54 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->scanner = _tmp8_;
-#line 55 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 55 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp9_ = self->priv->scanner;
-#line 55 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 55 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp9_, "update-devices", (GCallback) _simple_scan_update_scan_devices_cb_scanner_update_devices, self, 0);
-#line 56 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp10_ = self->priv->scanner;
-#line 56 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 56 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp10_, "request-authorization", (GCallback) _simple_scan_authorize_cb_scanner_request_authorization, self, 0);
-#line 57 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp11_ = self->priv->scanner;
-#line 57 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp11_, "expect-page", (GCallback) _simple_scan_scanner_new_page_cb_scanner_expect_page, self, 0);
-#line 58 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 58 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp12_ = self->priv->scanner;
-#line 58 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 58 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp12_, "got-page-info", (GCallback) _simple_scan_scanner_page_info_cb_scanner_got_page_info, self, 0);
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp13_ = self->priv->scanner;
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp13_, "got-line", (GCallback) _simple_scan_scanner_line_cb_scanner_got_line, self, 0);
-#line 60 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 60 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp14_ = self->priv->scanner;
-#line 60 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 60 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp14_, "page-done", (GCallback) _simple_scan_scanner_page_done_cb_scanner_page_done, self, 0);
-#line 61 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp15_ = self->priv->scanner;
-#line 61 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp15_, "document-done", (GCallback) _simple_scan_scanner_document_done_cb_scanner_document_done, self, 0);
-#line 62 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp16_ = self->priv->scanner;
-#line 62 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 62 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp16_, "scan-failed", (GCallback) _simple_scan_scanner_failed_cb_scanner_scan_failed, self, 0);
-#line 63 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp17_ = self->priv->scanner;
-#line 63 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp17_, "scanning-changed", (GCallback) _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed, self, 0);
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp18_ = g_strdup ("usb");
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp19_ = g_new0 (gchar*, 2 + 1);
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp19_[0] = _tmp18_;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp19_[1] = NULL;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	subsystems = _tmp19_;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	subsystems_length1 = 2;
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_subsystems_size_ = subsystems_length1;
-#line 66 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp20_ = subsystems;
-#line 66 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp20__length1 = subsystems_length1;
-#line 66 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp21_ = g_udev_client_new (_tmp20_);
-#line 66 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (self->priv->udev_client);
-#line 66 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 66 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->udev_client = _tmp21_;
-#line 67 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp22_ = self->priv->udev_client;
-#line 67 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_signal_connect_object (_tmp22_, "uevent", (GCallback) _simple_scan_on_uevent_g_udev_client_uevent, self, 0);
-#line 69 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp23_ = self->priv->default_device;
-#line 69 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp23_ != NULL) {
 #line 691 "simple-scan.c"
 		GList* device_list = NULL;
@@ -696,33 +696,33 @@ static void simple_scan_real_startup (GApplication* base) {
 		UserInterface* _tmp28_ = NULL;
 		ScanDevice* _tmp29_ = NULL;
 		const gchar* _tmp30_ = NULL;
-#line 71 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		device_list = NULL;
-#line 73 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp24_ = self->priv->default_device;
-#line 73 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp25_ = _scan_device_ref0 (_tmp24_);
-#line 73 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		device_list = g_list_append (device_list, _tmp25_);
-#line 74 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp26_ = self->priv->ui;
-#line 74 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp27_ = device_list;
-#line 74 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 74 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		user_interface_set_scan_devices (_tmp26_, _tmp27_);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp28_ = self->priv->ui;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp29_ = self->priv->default_device;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp30_ = _tmp29_->name;
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		user_interface_set_selected_device (_tmp28_, _tmp30_);
-#line 69 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		__g_list_free__scan_device_unref0_0 (device_list);
 #line 724 "simple-scan.c"
 	}
-#line 44 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	subsystems = (_vala_array_free (subsystems, subsystems_length1, (GDestroyNotify) g_free), NULL);
 #line 728 "simple-scan.c"
 }
@@ -732,17 +732,17 @@ static void simple_scan_real_activate (GApplication* base) {
 	SimpleScan * self;
 	UserInterface* _tmp0_ = NULL;
 	Scanner* _tmp1_ = NULL;
-#line 79 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self = (SimpleScan*) base;
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_APPLICATION_CLASS (simple_scan_parent_class)->activate ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_get_type (), GtkApplication));
-#line 82 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->ui;
-#line 82 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 82 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_start (_tmp0_);
-#line 83 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = self->priv->scanner;
-#line 83 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_start (_tmp1_);
 #line 748 "simple-scan.c"
 }
@@ -751,25 +751,25 @@ static void simple_scan_real_activate (GApplication* base) {
 static void simple_scan_real_shutdown (GApplication* base) {
 	SimpleScan * self;
 	Scanner* _tmp0_ = NULL;
-#line 86 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self = (SimpleScan*) base;
-#line 88 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_APPLICATION_CLASS (simple_scan_parent_class)->shutdown ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_get_type (), GtkApplication));
-#line 89 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_book_unref0 (self->priv->book);
-#line 89 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->book = NULL;
-#line 90 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (self->priv->ui);
-#line 90 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->ui = NULL;
-#line 91 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (self->priv->udev_client);
-#line 91 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->udev_client = NULL;
-#line 92 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->scanner;
-#line 92 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 92 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_free (_tmp0_);
 #line 775 "simple-scan.c"
 }
@@ -784,39 +784,39 @@ static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scann
 	guint _tmp11_ = 0U;
 	UserInterface* _tmp12_ = NULL;
 	GList* _tmp13_ = NULL;
-#line 95 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 95 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 97 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = devices;
-#line 97 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = g_list_copy (_tmp0_);
-#line 97 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	devices_copy = _tmp1_;
-#line 100 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = self->priv->default_device;
-#line 100 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp2_ != NULL) {
 #line 802 "simple-scan.c"
 		gboolean default_in_list = FALSE;
 		GList* _tmp3_ = NULL;
 		gboolean _tmp8_ = FALSE;
-#line 102 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		default_in_list = FALSE;
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp3_ = devices_copy;
 #line 810 "simple-scan.c"
 		{
 			GList* device_collection = NULL;
 			GList* device_it = NULL;
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			device_collection = _tmp3_;
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
 #line 818 "simple-scan.c"
 				ScanDevice* device = NULL;
-#line 103 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				device = (ScanDevice*) device_it->data;
 #line 822 "simple-scan.c"
 				{
@@ -824,51 +824,51 @@ static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scann
 					const gchar* _tmp5_ = NULL;
 					ScanDevice* _tmp6_ = NULL;
 					const gchar* _tmp7_ = NULL;
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp4_ = device;
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp5_ = _tmp4_->name;
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp6_ = self->priv->default_device;
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp7_ = _tmp6_->name;
-#line 105 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (g_strcmp0 (_tmp5_, _tmp7_) == 0) {
-#line 107 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 107 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						default_in_list = TRUE;
-#line 108 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
 #line 842 "simple-scan.c"
 					}
 				}
 			}
 		}
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = default_in_list;
-#line 112 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (!_tmp8_) {
 #line 851 "simple-scan.c"
 			ScanDevice* _tmp9_ = NULL;
-#line 113 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp9_ = self->priv->default_device;
-#line 113 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			devices_copy = g_list_prepend (devices_copy, _tmp9_);
 #line 857 "simple-scan.c"
 		}
 	}
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp10_ = devices_copy;
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp11_ = g_list_length (_tmp10_);
-#line 116 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->have_devices = _tmp11_ > ((guint) 0);
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp12_ = self->priv->ui;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp13_ = devices_copy;
-#line 117 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_set_scan_devices (_tmp12_, _tmp13_);
-#line 95 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 95 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_list_free0 (devices_copy);
 #line 874 "simple-scan.c"
 }
@@ -882,33 +882,33 @@ static void simple_scan_authorize_cb (SimpleScan* self, Scanner* scanner, const
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	Scanner* _tmp4_ = NULL;
-#line 120 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 120 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 120 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (resource != NULL);
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->ui;
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = resource;
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_authorize (_tmp0_, _tmp1_, &_tmp2_, &_tmp3_);
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (username);
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	username = _tmp2_;
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (password);
-#line 123 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 123 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	password = _tmp3_;
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = scanner;
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_authorize (_tmp4_, username, password);
-#line 120 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (password);
-#line 120 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (username);
 #line 914 "simple-scan.c"
 }
@@ -943,81 +943,81 @@ static Page* simple_scan_append_page (SimpleScan* self) {
 	UserInterface* _tmp60_ = NULL;
 	Page* _tmp61_ = NULL;
 	Page* _tmp62_ = NULL;
-#line 127 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 130 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->book;
-#line 130 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = book_get_page (_tmp0_, -1);
-#line 130 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp1_;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = page;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp3_ != NULL) {
 #line 959 "simple-scan.c"
 		Page* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp4_ = page;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = page_get_has_data (_tmp4_);
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = _tmp5_;
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp2_ = !_tmp6_;
 #line 971 "simple-scan.c"
 	} else {
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp2_ = FALSE;
 #line 975 "simple-scan.c"
 	}
-#line 131 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp2_) {
 #line 979 "simple-scan.c"
 		UserInterface* _tmp7_ = NULL;
 		Page* _tmp8_ = NULL;
 		Page* _tmp9_ = NULL;
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp7_ = self->priv->ui;
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = page;
-#line 133 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		user_interface_set_selected_page (_tmp7_, _tmp8_);
-#line 134 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp9_ = page;
-#line 134 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		page_start (_tmp9_);
-#line 135 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = page;
-#line 135 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
 #line 997 "simple-scan.c"
 	}
-#line 139 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 140 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	do_crop = FALSE;
-#line 141 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	named_crop = NULL;
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	width = 100;
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	height = 100;
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	dpi = 100;
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	cx = 0;
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	cy = 0;
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	cw = 0;
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	ch = 0;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp10_ = page;
-#line 143 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp10_ != NULL) {
 #line 1023 "simple-scan.c"
 		Page* _tmp11_ = NULL;
@@ -1036,49 +1036,49 @@ static Page* simple_scan_append_page (SimpleScan* self) {
 		gboolean _tmp24_ = FALSE;
 		gboolean _tmp25_ = FALSE;
 		gboolean _tmp26_ = FALSE;
-#line 145 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = page;
-#line 145 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp12_ = page_get_scan_direction (_tmp11_);
-#line 145 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp13_ = _tmp12_;
-#line 145 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		scan_direction = _tmp13_;
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp14_ = page;
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp15_ = page_get_width (_tmp14_);
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp16_ = _tmp15_;
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		width = _tmp16_;
-#line 147 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp17_ = page;
-#line 147 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp18_ = page_get_height (_tmp17_);
-#line 147 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp19_ = _tmp18_;
-#line 147 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		height = _tmp19_;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp20_ = page;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp21_ = page_get_dpi (_tmp20_);
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp22_ = _tmp21_;
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		dpi = _tmp22_;
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp23_ = page;
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp24_ = page_get_has_crop (_tmp23_);
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp25_ = _tmp24_;
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		do_crop = _tmp25_;
-#line 151 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp26_ = do_crop;
-#line 151 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp26_) {
 #line 1084 "simple-scan.c"
 			Page* _tmp27_ = NULL;
@@ -1097,135 +1097,135 @@ static Page* simple_scan_append_page (SimpleScan* self) {
 			Page* _tmp40_ = NULL;
 			gint _tmp41_ = 0;
 			gint _tmp42_ = 0;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp27_ = page;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp28_ = page_get_crop_name (_tmp27_);
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp29_ = _tmp28_;
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp30_ = g_strdup (_tmp29_);
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (named_crop);
-#line 153 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			named_crop = _tmp30_;
-#line 154 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp31_ = page;
-#line 154 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp32_ = page_get_crop_x (_tmp31_);
-#line 154 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp33_ = _tmp32_;
-#line 154 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			cx = _tmp33_;
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp34_ = page;
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp35_ = page_get_crop_y (_tmp34_);
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp36_ = _tmp35_;
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			cy = _tmp36_;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp37_ = page;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp38_ = page_get_crop_width (_tmp37_);
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp39_ = _tmp38_;
-#line 156 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 156 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			cw = _tmp39_;
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp40_ = page;
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp41_ = page_get_crop_height (_tmp40_);
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp42_ = _tmp41_;
-#line 157 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			ch = _tmp42_;
 #line 1145 "simple-scan.c"
 		}
 	}
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp43_ = width;
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp44_ = height;
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp45_ = dpi;
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp46_ = scan_direction;
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp47_ = page_new (_tmp43_, _tmp44_, _tmp45_, _tmp46_);
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
-#line 161 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp47_;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp48_ = self->priv->book;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp49_ = page;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	book_append_page (_tmp48_, _tmp49_);
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp50_ = do_crop;
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp50_) {
 #line 1172 "simple-scan.c"
 		const gchar* _tmp51_ = NULL;
 		Page* _tmp57_ = NULL;
 		gint _tmp58_ = 0;
 		gint _tmp59_ = 0;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp51_ = named_crop;
-#line 165 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp51_ != NULL) {
 #line 1181 "simple-scan.c"
 			Page* _tmp52_ = NULL;
 			const gchar* _tmp53_ = NULL;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp52_ = page;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp53_ = named_crop;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			page_set_named_crop (_tmp52_, _tmp53_);
 #line 1190 "simple-scan.c"
 		} else {
 			Page* _tmp54_ = NULL;
 			gint _tmp55_ = 0;
 			gint _tmp56_ = 0;
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp54_ = page;
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp55_ = cw;
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp56_ = ch;
-#line 170 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			page_set_custom_crop (_tmp54_, _tmp55_, _tmp56_);
 #line 1203 "simple-scan.c"
 		}
-#line 171 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp57_ = page;
-#line 171 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp58_ = cx;
-#line 171 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp59_ = cy;
-#line 171 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		page_move_crop (_tmp57_, _tmp58_, _tmp59_);
 #line 1213 "simple-scan.c"
 	}
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp60_ = self->priv->ui;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp61_ = page;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_set_selected_page (_tmp60_, _tmp61_);
-#line 174 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp62_ = page;
-#line 174 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 174 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_start (_tmp62_);
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	result = page;
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (named_crop);
-#line 176 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
 #line 1231 "simple-scan.c"
 }
@@ -1234,15 +1234,15 @@ static Page* simple_scan_append_page (SimpleScan* self) {
 static void simple_scan_scanner_new_page_cb (SimpleScan* self, Scanner* scanner) {
 	Page* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 179 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 179 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 181 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = simple_scan_append_page (self);
-#line 181 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = _tmp0_;
-#line 181 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (_tmp1_);
 #line 1248 "simple-scan.c"
 }
@@ -1273,32 +1273,32 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 	const gchar* _tmp37_ = NULL;
 	gchar* _tmp38_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 184 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 184 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (device_name != NULL, NULL);
-#line 187 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = device_name;
-#line 187 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = g_strdup_printf ("sane:%s", _tmp0_);
-#line 187 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	device_id = _tmp1_;
-#line 188 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = device_name;
-#line 188 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_debug ("simple-scan.vala:188: Getting color profile for device %s", _tmp2_);
-#line 190 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = cd_client_new ();
-#line 190 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	client = _tmp3_;
 #line 1295 "simple-scan.c"
 	{
 		CdClient* _tmp4_ = NULL;
-#line 193 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp4_ = client;
-#line 193 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		cd_client_connect_sync (_tmp4_, NULL, &_inner_error_);
-#line 193 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1304 "simple-scan.c"
 			goto __catch4_g_error;
@@ -1310,40 +1310,40 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		GError* e = NULL;
 		GError* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 197 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = e;
-#line 197 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = _tmp5_->message;
-#line 197 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_debug ("simple-scan.vala:197: Failed to connect to colord: %s", _tmp6_);
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
 #line 1334 "simple-scan.c"
 	}
 	__finally4:
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 191 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 191 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
 #line 1349 "simple-scan.c"
 	}
@@ -1353,28 +1353,28 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		const gchar* _tmp9_ = NULL;
 		CdDevice* _tmp10_ = NULL;
 		CdDevice* _tmp11_ = NULL;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = client;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp9_ = device_id;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp10_ = cd_client_find_device_by_property_sync (_tmp8_, CD_DEVICE_PROPERTY_SERIAL, _tmp9_, NULL, &_inner_error_);
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp7_ = _tmp10_;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1367 "simple-scan.c"
 			goto __catch5_g_error;
 		}
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = _tmp7_;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp7_ = NULL;
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 204 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		device = _tmp11_;
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (_tmp7_);
 #line 1380 "simple-scan.c"
 	}
@@ -1385,56 +1385,56 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		const gchar* _tmp12_ = NULL;
 		GError* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp12_ = device_name;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp13_ = e;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp14_ = _tmp13_->message;
-#line 208 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_debug ("simple-scan.vala:208: Unable to find colord device %s: %s", _tmp12_, _tmp14_);
-#line 209 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 209 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 209 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 209 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 209 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 209 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
 #line 1413 "simple-scan.c"
 	}
 	__finally5:
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 202 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 202 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
 #line 1430 "simple-scan.c"
 	}
 	{
 		CdDevice* _tmp15_ = NULL;
-#line 214 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp15_ = device;
-#line 214 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		cd_device_connect_sync (_tmp15_, NULL, &_inner_error_);
-#line 214 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1440 "simple-scan.c"
 			goto __catch6_g_error;
@@ -1447,86 +1447,86 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		const gchar* _tmp16_ = NULL;
 		GError* _tmp17_ = NULL;
 		const gchar* _tmp18_ = NULL;
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp16_ = device_name;
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp17_ = e;
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp18_ = _tmp17_->message;
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_debug ("simple-scan.vala:218: Failed to get properties from the device %s: %s", _tmp16_, _tmp18_);
-#line 219 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 219 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 219 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 219 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 219 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 219 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
 #line 1475 "simple-scan.c"
 	}
 	__finally6:
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 212 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
 #line 1492 "simple-scan.c"
 	}
-#line 222 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp19_ = device;
-#line 222 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp20_ = cd_device_get_default_profile (_tmp19_);
-#line 222 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	profile = _tmp20_;
-#line 223 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp21_ = profile;
-#line 223 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp21_ == NULL) {
 #line 1504 "simple-scan.c"
 		const gchar* _tmp22_ = NULL;
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp22_ = device_name;
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_debug ("simple-scan.vala:225: No default color profile for device: %s", _tmp22_);
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (profile);
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 226 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
 #line 1522 "simple-scan.c"
 	}
 	{
 		CdProfile* _tmp23_ = NULL;
-#line 231 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp23_ = profile;
-#line 231 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		cd_profile_connect_sync (_tmp23_, NULL, &_inner_error_);
-#line 231 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1532 "simple-scan.c"
 			goto __catch7_g_error;
@@ -1539,110 +1539,110 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		const gchar* _tmp24_ = NULL;
 		GError* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
-#line 229 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 229 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 235 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp24_ = device_name;
-#line 235 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp25_ = e;
-#line 235 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp26_ = _tmp25_->message;
-#line 235 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_debug ("simple-scan.vala:235: Failed to get properties from the profile %s: %s", _tmp24_, _tmp26_);
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (profile);
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 236 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
 #line 1569 "simple-scan.c"
 	}
 	__finally7:
-#line 229 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 229 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (profile);
-#line 229 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 229 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 229 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 229 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 229 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 229 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
 #line 1588 "simple-scan.c"
 	}
-#line 239 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp27_ = profile;
-#line 239 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp28_ = cd_profile_get_filename (_tmp27_);
-#line 239 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp29_ = _tmp28_;
-#line 239 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp29_ == NULL) {
 #line 1598 "simple-scan.c"
 		const gchar* _tmp30_ = NULL;
-#line 241 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp30_ = device_name;
-#line 241 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_debug ("simple-scan.vala:241: No icc color profile for the device %s", _tmp30_);
-#line 242 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 242 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (profile);
-#line 242 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
-#line 242 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (client);
-#line 242 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (device_id);
-#line 242 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
 #line 1616 "simple-scan.c"
 	}
-#line 245 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp31_ = profile;
-#line 245 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp32_ = cd_profile_get_filename (_tmp31_);
-#line 245 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp33_ = _tmp32_;
-#line 245 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp34_ = device_name;
-#line 245 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_debug ("simple-scan.vala:245: Using color profile %s for device %s", _tmp33_, _tmp34_);
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp35_ = profile;
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp36_ = cd_profile_get_filename (_tmp35_);
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp37_ = _tmp36_;
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp38_ = g_strdup (_tmp37_);
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	result = _tmp38_;
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (profile);
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (device);
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (client);
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (device_id);
-#line 246 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
 #line 1648 "simple-scan.c"
 }
@@ -1662,48 +1662,48 @@ static void simple_scan_scanner_page_info_cb (SimpleScan* self, Scanner* scanner
 	const gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
 	gchar* _tmp11_ = NULL;
-#line 252 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 252 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 252 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (info != NULL);
-#line 254 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = info;
-#line 254 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = _tmp0_->width;
-#line 254 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = info;
-#line 254 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = _tmp2_->height;
-#line 254 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = info;
-#line 254 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp5_ = _tmp4_->depth;
-#line 254 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_debug ("simple-scan.vala:254: Page is %d pixels wide, %d pixels high, %d bits " \
 "per pixel", _tmp1_, _tmp3_, _tmp5_);
-#line 258 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp6_ = simple_scan_append_page (self);
-#line 258 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp6_;
-#line 259 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp7_ = info;
-#line 259 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_set_page_info (page, _tmp7_);
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp8_ = info;
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp9_ = _tmp8_->device;
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp10_ = simple_scan_get_profile_for_device (self, _tmp9_);
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp11_ = _tmp10_;
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_set_color_profile (page, _tmp11_);
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (_tmp11_);
-#line 252 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
 #line 1708 "simple-scan.c"
 }
@@ -1717,29 +1717,29 @@ static void simple_scan_scanner_line_cb (SimpleScan* self, Scanner* scanner, Sca
 	guint _tmp3_ = 0U;
 	Page* _tmp4_ = NULL;
 	ScanLine* _tmp5_ = NULL;
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (line != NULL);
-#line 269 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->book;
-#line 269 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = self->priv->book;
-#line 269 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 269 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = _tmp2_;
-#line 269 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = book_get_page (_tmp0_, ((gint) _tmp3_) - 1);
-#line 269 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp4_;
-#line 270 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp5_ = line;
-#line 270 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_parse_scan_line (page, _tmp5_);
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
 #line 1744 "simple-scan.c"
 }
@@ -1752,25 +1752,25 @@ static void simple_scan_scanner_page_done_cb (SimpleScan* self, Scanner* scanner
 	guint _tmp2_ = 0U;
 	guint _tmp3_ = 0U;
 	Page* _tmp4_ = NULL;
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->book;
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = self->priv->book;
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = _tmp2_;
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = book_get_page (_tmp0_, ((gint) _tmp3_) - 1);
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp4_;
-#line 276 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page_finish (page);
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
 #line 1775 "simple-scan.c"
 }
@@ -1786,51 +1786,51 @@ static void simple_scan_remove_empty_page (SimpleScan* self) {
 	Page* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 279 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->book;
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = self->priv->book;
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = _tmp2_;
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = book_get_page (_tmp0_, ((gint) _tmp3_) - 1);
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	page = _tmp4_;
-#line 282 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp5_ = page;
-#line 282 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp6_ = page_get_has_data (_tmp5_);
-#line 282 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp7_ = _tmp6_;
-#line 282 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (!_tmp7_) {
 #line 1811 "simple-scan.c"
 		Book* _tmp8_ = NULL;
 		Page* _tmp9_ = NULL;
-#line 283 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = self->priv->book;
-#line 283 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp9_ = page;
-#line 283 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		book_delete_page (_tmp8_, _tmp9_);
 #line 1820 "simple-scan.c"
 	}
-#line 279 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
 #line 1824 "simple-scan.c"
 }
 
 
 static void simple_scan_scanner_document_done_cb (SimpleScan* self, Scanner* scanner) {
-#line 286 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 286 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_remove_empty_page (self);
 #line 1835 "simple-scan.c"
 }
@@ -1838,32 +1838,32 @@ static void simple_scan_scanner_document_done_cb (SimpleScan* self, Scanner* sca
 
 static void simple_scan_scanner_failed_cb (SimpleScan* self, Scanner* scanner, gint error_code, const gchar* error_string) {
 	gint _tmp0_ = 0;
-#line 291 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 291 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 291 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (error_string != NULL);
-#line 293 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_remove_empty_page (self);
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = error_code;
-#line 294 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 294 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp0_ != ((gint) SANE_STATUS_CANCELLED)) {
 #line 1853 "simple-scan.c"
 		UserInterface* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp1_ = self->priv->ui;
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp2_ = _ ("Failed to scan");
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp3_ = error_string;
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp4_ = self->priv->have_devices;
-#line 296 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		user_interface_show_error (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
 #line 1868 "simple-scan.c"
 	}
@@ -1874,17 +1874,17 @@ static void simple_scan_scanner_scanning_changed_cb (SimpleScan* self, Scanner*
 	UserInterface* _tmp0_ = NULL;
 	Scanner* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (scanner != NULL);
-#line 305 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->ui;
-#line 305 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = scanner;
-#line 305 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = scanner_is_scanning (_tmp1_);
-#line 305 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_set_scanning (_tmp0_, _tmp2_);
 #line 1889 "simple-scan.c"
 }
@@ -1910,93 +1910,93 @@ static void simple_scan_scan_cb (SimpleScan* self, UserInterface* ui, const gcha
 	Scanner* _tmp17_ = NULL;
 	const gchar* _tmp18_ = NULL;
 	ScanOptions* _tmp19_ = NULL;
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (ui != NULL);
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (options != NULL);
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = options;
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = _tmp0_->dpi;
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = device;
-#line 310 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_debug ("simple-scan.vala:310: Requesting scan at %d dpi from device '%s'", _tmp1_, _tmp2_);
-#line 312 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = self->priv->scanner;
-#line 312 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = scanner_is_scanning (_tmp3_);
-#line 312 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (!_tmp4_) {
 #line 1933 "simple-scan.c"
 		Page* _tmp5_ = NULL;
 		Page* _tmp6_ = NULL;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = simple_scan_append_page (self);
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = _tmp5_;
-#line 313 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_page_unref0 (_tmp6_);
 #line 1942 "simple-scan.c"
 	}
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp7_ = _ ("Scanned Document");
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp8_ = g_strdup (_tmp7_);
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	filename_prefix = _tmp8_;
-#line 318 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp9_ = options;
-#line 318 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp10_ = _tmp9_->scan_mode;
-#line 318 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp10_ == SCAN_MODE_COLOR) {
 #line 1956 "simple-scan.c"
 		gchar* _tmp11_ = NULL;
-#line 319 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = g_strdup ("jpg");
-#line 319 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (extension);
-#line 319 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		extension = _tmp11_;
 #line 1964 "simple-scan.c"
 	} else {
 		gchar* _tmp12_ = NULL;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp12_ = g_strdup ("pdf");
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (extension);
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		extension = _tmp12_;
 #line 1973 "simple-scan.c"
 	}
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp13_ = filename_prefix;
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp14_ = extension;
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp15_ = g_strdup_printf ("%s.%s", _tmp13_, _tmp14_);
-#line 322 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	filename = _tmp15_;
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp16_ = ui;
-#line 323 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_set_default_file_name (_tmp16_, filename);
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp17_ = self->priv->scanner;
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp18_ = device;
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp19_ = options;
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_scan (_tmp17_, _tmp18_, _tmp19_);
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (filename);
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (extension);
-#line 308 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (filename_prefix);
 #line 2001 "simple-scan.c"
 }
@@ -2004,13 +2004,13 @@ static void simple_scan_scan_cb (SimpleScan* self, UserInterface* ui, const gcha
 
 static void simple_scan_cancel_cb (SimpleScan* self, UserInterface* ui) {
 	Scanner* _tmp0_ = NULL;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (ui != NULL);
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->scanner;
-#line 329 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_cancel (_tmp0_);
 #line 2015 "simple-scan.c"
 }
@@ -2024,19 +2024,19 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 	gchar* _tmp2_ = NULL;
 	gchar* path = NULL;
 	GError * _inner_error_ = NULL;
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (prefix != NULL, NULL);
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (extension != NULL, NULL);
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = prefix;
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = extension;
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
-#line 337 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	filename = _tmp2_;
 #line 2041 "simple-scan.c"
 	{
@@ -2045,24 +2045,24 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 		gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp3_ = filename;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = g_file_open_tmp (_tmp3_, &_tmp4_, &_inner_error_);
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (path);
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		path = _tmp4_;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fd = _tmp5_;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2060 "simple-scan.c"
 			goto __catch8_g_error;
 		}
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = fd;
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		close (_tmp6_);
 #line 2067 "simple-scan.c"
 	}
@@ -2072,48 +2072,48 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 		GError* e = NULL;
 		GError* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 346 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp7_ = e;
-#line 346 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = _tmp7_->message;
-#line 346 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_warning ("simple-scan.vala:346: Error saving email attachment: %s", _tmp8_);
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (path);
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (filename);
-#line 347 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
 #line 2095 "simple-scan.c"
 	}
 	__finally8:
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (path);
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (filename);
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 339 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
 #line 2110 "simple-scan.c"
 	}
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	result = path;
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (filename);
-#line 350 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
 #line 2118 "simple-scan.c"
 }
@@ -2126,33 +2126,33 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp42_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 353 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 353 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (ui != NULL);
-#line 353 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (profile != NULL);
-#line 355 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	saved = FALSE;
-#line 356 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = g_strdup ("xdg-email");
-#line 356 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	command_line = _tmp0_;
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = profile;
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (g_strcmp0 (_tmp1_, "text") == 0) {
 #line 2145 "simple-scan.c"
 		gchar* path = NULL;
 		gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-#line 362 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp2_ = simple_scan_get_temporary_filename (self, "scan", "pdf");
-#line 362 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		path = _tmp2_;
-#line 363 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp3_ = path;
-#line 363 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp3_ != NULL) {
 #line 2157 "simple-scan.c"
 			GFile* file = NULL;
@@ -2164,30 +2164,30 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 			gchar* _tmp15_ = NULL;
 			gchar* _tmp16_ = NULL;
 			gchar* _tmp17_ = NULL;
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp4_ = path;
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp5_ = g_file_new_for_path (_tmp4_);
-#line 365 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 365 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			file = _tmp5_;
-#line 366 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp6_ = ui;
-#line 366 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			user_interface_show_progress_dialog (_tmp6_);
 #line 2177 "simple-scan.c"
 			{
 				Book* _tmp7_ = NULL;
 				gint _tmp8_ = 0;
 				GFile* _tmp9_ = NULL;
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp7_ = self->priv->book;
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp8_ = quality;
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp9_ = file;
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				book_save (_tmp7_, "pdf", _tmp8_, _tmp9_, &_inner_error_);
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2192 "simple-scan.c"
 					goto __catch9_g_error;
@@ -2200,83 +2200,83 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 				UserInterface* _tmp10_ = NULL;
 				GError* _tmp11_ = NULL;
 				const gchar* _tmp12_ = NULL;
-#line 367 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				e = _inner_error_;
-#line 367 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_inner_error_ = NULL;
-#line 373 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp10_ = ui;
-#line 373 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 373 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				user_interface_hide_progress_dialog (_tmp10_);
-#line 374 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp11_ = e;
-#line 374 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp12_ = _tmp11_->message;
-#line 374 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 374 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				g_warning ("simple-scan.vala:374: Unable to save email file: %s", _tmp12_);
-#line 375 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_error_free0 (e);
-#line 375 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_object_unref0 (file);
-#line 375 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_free0 (path);
-#line 375 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_free0 (command_line);
-#line 375 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				return;
 #line 2227 "simple-scan.c"
 			}
 			__finally9:
-#line 367 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 367 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_object_unref0 (file);
-#line 367 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_free0 (path);
-#line 367 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_free0 (command_line);
-#line 367 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 367 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				g_clear_error (&_inner_error_);
-#line 367 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				return;
 #line 2244 "simple-scan.c"
 			}
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp13_ = command_line;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp14_ = path;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp15_ = g_strdup_printf (" --attach %s", _tmp14_);
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp16_ = _tmp15_;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp17_ = g_strconcat (_tmp13_, _tmp16_, NULL);
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (command_line);
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			command_line = _tmp17_;
-#line 377 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (_tmp16_);
-#line 363 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_object_unref0 (file);
 #line 2264 "simple-scan.c"
 		}
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (path);
 #line 2268 "simple-scan.c"
 	} else {
 		{
 			gint i = 0;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			i = 0;
 #line 2274 "simple-scan.c"
 			{
 				gboolean _tmp18_ = FALSE;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp18_ = TRUE;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				while (TRUE) {
 #line 2281 "simple-scan.c"
 					gint _tmp20_ = 0;
@@ -2295,53 +2295,53 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 					gchar* _tmp39_ = NULL;
 					gchar* _tmp40_ = NULL;
 					gboolean _tmp41_ = FALSE;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (!_tmp18_) {
 #line 2300 "simple-scan.c"
 						gint _tmp19_ = 0;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp19_ = i;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						i = _tmp19_ + 1;
 #line 2306 "simple-scan.c"
 					}
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp18_ = FALSE;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp20_ = i;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp21_ = self->priv->book;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp22_ = book_get_n_pages (_tmp21_);
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp23_ = _tmp22_;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (!(((guint) _tmp20_) < _tmp23_)) {
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
 #line 2322 "simple-scan.c"
 					}
-#line 384 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp24_ = simple_scan_get_temporary_filename (self, "scan", "jpg");
-#line 384 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					path = _tmp24_;
-#line 385 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp25_ = path;
-#line 385 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (_tmp25_ == NULL) {
-#line 387 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						saved = FALSE;
-#line 388 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (path);
-#line 388 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
 #line 2338 "simple-scan.c"
 					}
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp26_ = path;
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp27_ = g_file_new_for_path (_tmp26_);
-#line 391 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 391 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					file = _tmp27_;
 #line 2346 "simple-scan.c"
 					{
@@ -2351,23 +2351,23 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 						Page* _tmp31_ = NULL;
 						gint _tmp32_ = 0;
 						GFile* _tmp33_ = NULL;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp28_ = self->priv->book;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp29_ = i;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp30_ = book_get_page (_tmp28_, _tmp29_);
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp31_ = _tmp30_;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp32_ = quality;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp33_ = file;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						page_save (_tmp31_, "jpeg", _tmp32_, _tmp33_, &_inner_error_);
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_page_unref0 (_tmp31_);
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2372 "simple-scan.c"
 							goto __catch10_g_error;
@@ -2379,94 +2379,94 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 						GError* e = NULL;
 						GError* _tmp34_ = NULL;
 						const gchar* _tmp35_ = NULL;
-#line 392 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						e = _inner_error_;
-#line 392 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_inner_error_ = NULL;
-#line 398 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp34_ = e;
-#line 398 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp35_ = _tmp34_->message;
-#line 398 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						g_warning ("simple-scan.vala:398: Unable to save email file: %s", _tmp35_);
-#line 399 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_error_free0 (e);
-#line 399 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_object_unref0 (file);
-#line 399 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (path);
-#line 399 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (command_line);
-#line 399 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						return;
 #line 2402 "simple-scan.c"
 					}
 					__finally10:
-#line 392 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 392 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_object_unref0 (file);
-#line 392 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (path);
-#line 392 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (command_line);
-#line 392 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 392 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						g_clear_error (&_inner_error_);
-#line 392 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						return;
 #line 2419 "simple-scan.c"
 					}
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp36_ = command_line;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp37_ = path;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp38_ = g_strdup_printf (" --attach %s", _tmp37_);
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp39_ = _tmp38_;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp40_ = g_strconcat (_tmp36_, _tmp39_, NULL);
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_free0 (command_line);
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					command_line = _tmp40_;
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_free0 (_tmp39_);
-#line 403 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp41_ = saved;
-#line 403 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (!_tmp41_) {
-#line 404 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_object_unref0 (file);
-#line 404 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (path);
-#line 404 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
 #line 2447 "simple-scan.c"
 					}
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_object_unref0 (file);
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_free0 (path);
 #line 2453 "simple-scan.c"
 				}
 			}
 		}
 	}
-#line 408 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp42_ = command_line;
-#line 408 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_debug ("simple-scan.vala:408: Launching email client: %s", _tmp42_);
 #line 2462 "simple-scan.c"
 	{
 		const gchar* _tmp43_ = NULL;
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp43_ = command_line;
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_spawn_command_line_async (_tmp43_, &_inner_error_);
-#line 411 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2471 "simple-scan.c"
 			goto __catch11_g_error;
@@ -2478,34 +2478,34 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 		GError* e = NULL;
 		GError* _tmp44_ = NULL;
 		const gchar* _tmp45_ = NULL;
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp44_ = e;
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp45_ = _tmp44_->message;
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_warning ("simple-scan.vala:415: Unable to start email: %s", _tmp45_);
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
 #line 2493 "simple-scan.c"
 	}
 	__finally11:
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (command_line);
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 409 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return;
 #line 2506 "simple-scan.c"
 	}
-#line 353 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (command_line);
 #line 2510 "simple-scan.c"
 }
@@ -2520,131 +2520,131 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 	const gchar* _tmp11_ = NULL;
 	const gchar* _tmp12_ = NULL;
 	gboolean _tmp13_ = FALSE;
-#line 419 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (message != NULL);
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = log_level;
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	switch (_tmp0_ & G_LOG_LEVEL_MASK) {
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_ERROR:
 #line 2531 "simple-scan.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 426 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp1_ = g_strdup ("ERROR:");
-#line 426 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
-#line 426 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp1_;
-#line 427 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
 #line 2542 "simple-scan.c"
 		}
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_CRITICAL:
 #line 2546 "simple-scan.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 429 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp2_ = g_strdup ("CRITICAL:");
-#line 429 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
-#line 429 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 429 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp2_;
-#line 430 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 430 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
 #line 2557 "simple-scan.c"
 		}
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_WARNING:
 #line 2561 "simple-scan.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 432 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp3_ = g_strdup ("WARNING:");
-#line 432 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
-#line 432 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp3_;
-#line 433 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
 #line 2572 "simple-scan.c"
 		}
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_MESSAGE:
 #line 2576 "simple-scan.c"
 		{
 			gchar* _tmp4_ = NULL;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp4_ = g_strdup ("MESSAGE:");
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp4_;
-#line 436 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
 #line 2587 "simple-scan.c"
 		}
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_INFO:
 #line 2591 "simple-scan.c"
 		{
 			gchar* _tmp5_ = NULL;
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp5_ = g_strdup ("INFO:");
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp5_;
-#line 439 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
 #line 2602 "simple-scan.c"
 		}
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_DEBUG:
 #line 2606 "simple-scan.c"
 		{
 			gchar* _tmp6_ = NULL;
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp6_ = g_strdup ("DEBUG:");
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
-#line 441 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 441 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp6_;
-#line 442 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 442 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
 #line 2617 "simple-scan.c"
 		}
 		default:
 		{
 			gchar* _tmp7_ = NULL;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp7_ = g_strdup ("LOG:");
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (prefix);
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			prefix = _tmp7_;
-#line 445 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 445 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
 #line 2630 "simple-scan.c"
 		}
 	}
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp8_ = simple_scan_log_file;
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp9_ = simple_scan_log_timer;
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp10_ = g_timer_elapsed (_tmp9_, NULL);
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp11_ = prefix;
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp12_ = message;
-#line 448 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	fprintf (_tmp8_, "[%+.2fs] %s %s\n", _tmp10_, _tmp11_, _tmp12_);
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp13_ = simple_scan_debug_enabled;
-#line 449 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp13_) {
 #line 2649 "simple-scan.c"
 		FILE* _tmp14_ = NULL;
@@ -2652,21 +2652,21 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 		gdouble _tmp16_ = 0.0;
 		const gchar* _tmp17_ = NULL;
 		const gchar* _tmp18_ = NULL;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp14_ = stderr;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp15_ = simple_scan_log_timer;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp16_ = g_timer_elapsed (_tmp15_, NULL);
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp17_ = prefix;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp18_ = message;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp14_, "[%+.2fs] %s %s\n", _tmp16_, _tmp17_, _tmp18_);
 #line 2667 "simple-scan.c"
 	}
-#line 419 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 419 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (prefix);
 #line 2671 "simple-scan.c"
 }
@@ -2674,17 +2674,17 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 
 static void simple_scan_on_uevent (SimpleScan* self, GUdevClient* client, const gchar* action, GUdevDevice* device) {
 	Scanner* _tmp0_ = NULL;
-#line 453 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
-#line 453 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (client != NULL);
-#line 453 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (action != NULL);
-#line 453 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (device != NULL);
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = self->priv->scanner;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_redetect (_tmp0_);
 #line 2689 "simple-scan.c"
 }
@@ -2886,61 +2886,61 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 	gint _tmp106_ = 0;
 	gboolean _tmp107_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 458 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (filename != NULL);
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = filename;
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_file_get_contents (_tmp0_, (gchar**) (&_tmp1_), &_tmp2_, &_inner_error_);
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	data = (g_free (data), NULL);
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	data = _tmp1_;
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	data_length1 = _tmp2_;
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_data_size_ = data_length1;
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_propagate_error (error, _inner_error_);
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		data = (g_free (data), NULL);
-#line 461 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return;
 #line 2911 "simple-scan.c"
 	}
-#line 463 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = filename;
-#line 463 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = g_strconcat (_tmp3_, ".fixed", NULL);
-#line 463 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp5_ = _tmp4_;
-#line 463 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp6_ = g_fopen (_tmp5_, "w");
-#line 463 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp7_ = _tmp6_;
-#line 463 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (_tmp5_);
-#line 463 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	fixed_file = _tmp7_;
-#line 465 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	offset = 0;
-#line 466 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	line_number = 0;
-#line 467 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 467 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	xref_offset = 0;
-#line 468 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	xref_line = -1;
-#line 469 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	startxref_line = -1;
-#line 470 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	fixed_size = -1;
-#line 471 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp8_ = g_string_new ("");
-#line 471 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	line = _tmp8_;
-#line 472 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	while (TRUE) {
 #line 2945 "simple-scan.c"
 		gint _tmp9_ = 0;
@@ -2955,23 +2955,23 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 		gint _tmp26_ = 0;
 		gint _tmp100_ = 0;
 		gint _tmp101_ = 0;
-#line 472 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp9_ = offset;
-#line 472 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (!(_tmp9_ < data_length1)) {
-#line 472 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
 #line 2964 "simple-scan.c"
 		}
-#line 474 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp10_ = offset;
-#line 474 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		end_offset = _tmp10_;
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = line;
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_string_assign (_tmp11_, "");
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		while (TRUE) {
 #line 2976 "simple-scan.c"
 			gint _tmp12_ = 0;
@@ -2982,90 +2982,90 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 			guint8 _tmp16_ = 0U;
 			gint _tmp17_ = 0;
 			guint8 _tmp18_ = 0U;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp12_ = end_offset;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (!(_tmp12_ < data_length1)) {
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				break;
 #line 2991 "simple-scan.c"
 			}
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp13_ = end_offset;
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp14_ = data[_tmp13_];
-#line 478 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			c = _tmp14_;
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp15_ = line;
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp16_ = c;
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			g_string_append_c (_tmp15_, (gchar) _tmp16_);
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp17_ = end_offset;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			end_offset = _tmp17_ + 1;
-#line 481 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp18_ = c;
-#line 481 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (_tmp18_ == ((guint8) '\n')) {
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				break;
 #line 3015 "simple-scan.c"
 			}
 		}
-#line 485 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp19_ = line;
-#line 485 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp20_ = _tmp19_->str;
-#line 485 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 485 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (g_strcmp0 (_tmp20_, "startxref\n") == 0) {
 #line 3024 "simple-scan.c"
 			gint _tmp21_ = 0;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp21_ = line_number;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			startxref_line = _tmp21_;
 #line 3030 "simple-scan.c"
 		}
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp22_ = line;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp23_ = _tmp22_->str;
-#line 488 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (g_strcmp0 (_tmp23_, "xref\n") == 0) {
 #line 3038 "simple-scan.c"
 			gint _tmp24_ = 0;
-#line 489 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp24_ = line_number;
-#line 489 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			xref_line = _tmp24_;
 #line 3044 "simple-scan.c"
 		}
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp26_ = line_number;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp26_ < 2) {
 #line 3050 "simple-scan.c"
 			GString* _tmp27_ = NULL;
 			const gchar* _tmp28_ = NULL;
 			gboolean _tmp29_ = FALSE;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp27_ = line;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp28_ = _tmp27_->str;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp29_ = g_str_has_prefix (_tmp28_, "%%");
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp25_ = _tmp29_;
 #line 3062 "simple-scan.c"
 		} else {
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp25_ = FALSE;
 #line 3066 "simple-scan.c"
 		}
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp25_) {
 #line 3070 "simple-scan.c"
 			gint _tmp30_ = 0;
@@ -3074,54 +3074,54 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 			const gchar* _tmp33_ = NULL;
 			gchar* _tmp34_ = NULL;
 			gchar* _tmp35_ = NULL;
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp30_ = xref_offset;
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			xref_offset = _tmp30_ - 1;
-#line 495 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp31_ = fixed_file;
-#line 495 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp32_ = line;
-#line 495 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp33_ = _tmp32_->str;
-#line 495 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp34_ = string_substring (_tmp33_, (glong) 1, (glong) (-1));
-#line 495 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp35_ = _tmp34_;
-#line 495 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			fprintf (_tmp31_, "%s", _tmp35_);
-#line 495 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (_tmp35_);
 #line 3095 "simple-scan.c"
 		} else {
 			gboolean _tmp36_ = FALSE;
 			gint _tmp37_ = 0;
 			gint _tmp38_ = 0;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp37_ = line_number;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp38_ = xref_line;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (_tmp37_ == (_tmp38_ + 1)) {
 #line 3106 "simple-scan.c"
 				GString* _tmp39_ = NULL;
 				const gchar* _tmp40_ = NULL;
 				gboolean _tmp41_ = FALSE;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp39_ = line;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp40_ = _tmp39_->str;
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp41_ = g_str_has_prefix (_tmp40_, "1 ");
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp36_ = _tmp41_;
 #line 3118 "simple-scan.c"
 			} else {
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp36_ = FALSE;
 #line 3122 "simple-scan.c"
 			}
-#line 499 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (_tmp36_) {
 #line 3126 "simple-scan.c"
 				GString* _tmp42_ = NULL;
@@ -3132,60 +3132,60 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 				FILE* _tmp47_ = NULL;
 				gint _tmp48_ = 0;
 				FILE* _tmp49_ = NULL;
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp42_ = line;
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp43_ = _tmp42_->str;
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp44_ = string_substring (_tmp43_, (glong) 2, (glong) (-1));
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp45_ = _tmp44_;
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp46_ = atoi (_tmp45_);
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				fixed_size = _tmp46_ + 1;
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_g_free0 (_tmp45_);
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp47_ = fixed_file;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp48_ = fixed_size;
-#line 502 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				fprintf (_tmp47_, "0 %d\n", _tmp48_);
-#line 503 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp49_ = fixed_file;
-#line 503 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				fprintf (_tmp49_, "0000000000 65535 f \n");
 #line 3159 "simple-scan.c"
 			} else {
 				gboolean _tmp50_ = FALSE;
 				gint _tmp51_ = 0;
 				gint _tmp52_ = 0;
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp51_ = line_number;
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp52_ = xref_line;
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				if (_tmp51_ > _tmp52_) {
 #line 3170 "simple-scan.c"
 					GString* _tmp53_ = NULL;
 					const gchar* _tmp54_ = NULL;
 					gboolean _tmp55_ = FALSE;
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp53_ = line;
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp54_ = _tmp53_->str;
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp55_ = g_str_has_suffix (_tmp54_, " 0000 n\n");
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp50_ = _tmp55_;
 #line 3182 "simple-scan.c"
 				} else {
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp50_ = FALSE;
 #line 3186 "simple-scan.c"
 				}
-#line 507 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				if (_tmp50_) {
 #line 3190 "simple-scan.c"
 					FILE* _tmp56_ = NULL;
@@ -3193,42 +3193,42 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 					const gchar* _tmp58_ = NULL;
 					gint _tmp59_ = 0;
 					gint _tmp60_ = 0;
-#line 508 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp56_ = fixed_file;
-#line 508 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp57_ = line;
-#line 508 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp58_ = _tmp57_->str;
-#line 508 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp59_ = atoi (_tmp58_);
-#line 508 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp60_ = xref_offset;
-#line 508 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					fprintf (_tmp56_, "%010d 00000 n \n", _tmp59_ + _tmp60_);
 #line 3208 "simple-scan.c"
 				} else {
 					gboolean _tmp61_ = FALSE;
 					gint _tmp62_ = 0;
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp62_ = startxref_line;
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (_tmp62_ > 0) {
 #line 3216 "simple-scan.c"
 						gint _tmp63_ = 0;
 						gint _tmp64_ = 0;
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp63_ = line_number;
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp64_ = startxref_line;
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp61_ = _tmp63_ == (_tmp64_ + 1);
 #line 3225 "simple-scan.c"
 					} else {
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp61_ = FALSE;
 #line 3229 "simple-scan.c"
 					}
-#line 511 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					if (_tmp61_) {
 #line 3233 "simple-scan.c"
 						FILE* _tmp65_ = NULL;
@@ -3238,99 +3238,99 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 						gint _tmp69_ = 0;
 						gchar* _tmp70_ = NULL;
 						gchar* _tmp71_ = NULL;
-#line 512 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp65_ = fixed_file;
-#line 512 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp66_ = line;
-#line 512 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp67_ = _tmp66_->str;
-#line 512 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp68_ = atoi (_tmp67_);
-#line 512 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp69_ = xref_offset;
-#line 512 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp70_ = g_strdup_printf ("%d\n", _tmp68_ + _tmp69_);
-#line 512 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp71_ = _tmp70_;
-#line 512 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						fprintf (_tmp65_, "%s", _tmp71_);
-#line 512 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (_tmp71_);
 #line 3259 "simple-scan.c"
 					} else {
 						gboolean _tmp72_ = FALSE;
 						gint _tmp73_ = 0;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp73_ = fixed_size;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (_tmp73_ > 0) {
 #line 3267 "simple-scan.c"
 							GString* _tmp74_ = NULL;
 							const gchar* _tmp75_ = NULL;
 							gboolean _tmp76_ = FALSE;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp74_ = line;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp75_ = _tmp74_->str;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp76_ = g_str_has_prefix (_tmp75_, "/Size ");
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp72_ = _tmp76_;
 #line 3279 "simple-scan.c"
 						} else {
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp72_ = FALSE;
 #line 3283 "simple-scan.c"
 						}
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (_tmp72_) {
 #line 3287 "simple-scan.c"
 							FILE* _tmp77_ = NULL;
 							gint _tmp78_ = 0;
 							gchar* _tmp79_ = NULL;
 							gchar* _tmp80_ = NULL;
-#line 515 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp77_ = fixed_file;
-#line 515 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp78_ = fixed_size;
-#line 515 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp79_ = g_strdup_printf ("/Size %d\n", _tmp78_);
-#line 515 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp80_ = _tmp79_;
-#line 515 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							fprintf (_tmp77_, "%s", _tmp80_);
-#line 515 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_g_free0 (_tmp80_);
 #line 3304 "simple-scan.c"
 						} else {
 							gboolean _tmp81_ = FALSE;
 							gint _tmp82_ = 0;
 							gint _tmp83_ = 0;
-#line 518 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp82_ = line_number;
-#line 518 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp83_ = startxref_line;
-#line 518 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							if (_tmp82_ == (_tmp83_ + 2)) {
 #line 3315 "simple-scan.c"
 								GString* _tmp84_ = NULL;
 								const gchar* _tmp85_ = NULL;
 								gboolean _tmp86_ = FALSE;
-#line 518 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp84_ = line;
-#line 518 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp85_ = _tmp84_->str;
-#line 518 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp86_ = g_str_has_prefix (_tmp85_, "%%%%");
-#line 518 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp81_ = _tmp86_;
 #line 3327 "simple-scan.c"
 							} else {
-#line 518 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp81_ = FALSE;
 #line 3331 "simple-scan.c"
 							}
-#line 518 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							if (_tmp81_) {
 #line 3335 "simple-scan.c"
 								FILE* _tmp87_ = NULL;
@@ -3338,35 +3338,35 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 								const gchar* _tmp89_ = NULL;
 								gchar* _tmp90_ = NULL;
 								gchar* _tmp91_ = NULL;
-#line 519 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp87_ = fixed_file;
-#line 519 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp88_ = line;
-#line 519 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp89_ = _tmp88_->str;
-#line 519 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp90_ = string_substring (_tmp89_, (glong) 2, (glong) (-1));
-#line 519 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_tmp91_ = _tmp90_;
-#line 519 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								fprintf (_tmp87_, "%s", _tmp91_);
-#line 519 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 								_g_free0 (_tmp91_);
 #line 3355 "simple-scan.c"
 							} else {
 								{
 									gint i = 0;
 									gint _tmp92_ = 0;
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									_tmp92_ = offset;
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 									i = _tmp92_;
 #line 3364 "simple-scan.c"
 									{
 										gboolean _tmp93_ = FALSE;
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 										_tmp93_ = TRUE;
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 										while (TRUE) {
 #line 3371 "simple-scan.c"
 											gint _tmp95_ = 0;
@@ -3374,35 +3374,35 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 											FILE* _tmp97_ = NULL;
 											gint _tmp98_ = 0;
 											guint8 _tmp99_ = 0U;
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											if (!_tmp93_) {
 #line 3379 "simple-scan.c"
 												gint _tmp94_ = 0;
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 												_tmp94_ = i;
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 												i = _tmp94_ + 1;
 #line 3385 "simple-scan.c"
 											}
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											_tmp93_ = FALSE;
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											_tmp95_ = i;
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											_tmp96_ = end_offset;
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											if (!(_tmp95_ < _tmp96_)) {
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 												break;
 #line 3397 "simple-scan.c"
 											}
-#line 523 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											_tmp97_ = fixed_file;
-#line 523 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											_tmp98_ = i;
-#line 523 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											_tmp99_ = data[_tmp98_];
-#line 523 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 											fputc ((gchar) _tmp99_, _tmp97_);
 #line 3407 "simple-scan.c"
 										}
@@ -3414,63 +3414,63 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 				}
 			}
 		}
-#line 525 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp100_ = line_number;
-#line 525 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		line_number = _tmp100_ + 1;
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp101_ = end_offset;
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		offset = _tmp101_;
 #line 3425 "simple-scan.c"
 	}
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp102_ = filename;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp103_ = filename;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp104_ = g_strconcat (_tmp103_, "~", NULL);
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp105_ = _tmp104_;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp106_ = g_rename (_tmp102_, _tmp105_);
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp107_ = _tmp106_ >= 0;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (_tmp105_);
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp107_) {
 #line 3443 "simple-scan.c"
 		const gchar* _tmp108_ = NULL;
 		gchar* _tmp109_ = NULL;
 		gchar* _tmp110_ = NULL;
 		const gchar* _tmp111_ = NULL;
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp108_ = filename;
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp109_ = g_strconcat (_tmp108_, ".fixed", NULL);
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp110_ = _tmp109_;
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp111_ = filename;
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_rename (_tmp110_, _tmp111_);
-#line 530 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (_tmp110_);
 #line 3460 "simple-scan.c"
 	}
-#line 458 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_string_free0 (line);
-#line 458 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_fclose0 (fixed_file);
-#line 458 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	data = (g_free (data), NULL);
 #line 3468 "simple-scan.c"
 }
 
 
 static void _simple_scan_log_cb_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
-#line 592 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_log_cb (log_domain, log_levels, message);
 #line 3475 "simple-scan.c"
 }
@@ -3505,38 +3505,38 @@ gint simple_scan_main (gchar** args, int args_length1) {
 	SimpleScan* _tmp49_ = NULL;
 	gint _tmp50_ = 0;
 	GError * _inner_error_ = NULL;
-#line 535 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	setlocale (LC_ALL, "");
-#line 536 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-#line 538 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	textdomain (GETTEXT_PACKAGE);
-#line 540 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = _ ("[DEVICE...] - Scanning utility");
-#line 540 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = g_option_context_new (_tmp0_);
-#line 540 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	c = _tmp1_;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = c;
-#line 542 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_option_context_add_main_entries (_tmp2_, SIMPLE_SCAN_options, GETTEXT_PACKAGE);
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = c;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = gtk_get_option_group (TRUE);
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_option_context_add_group (_tmp3_, _tmp4_);
 #line 3532 "simple-scan.c"
 	{
 		GOptionContext* _tmp5_ = NULL;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = c;
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_option_context_parse (_tmp5_, &args_length1, &args, &_inner_error_);
-#line 546 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3541 "simple-scan.c"
 			goto __catch12_g_error;
@@ -3555,101 +3555,101 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		gint _tmp11__length1 = 0;
 		const gchar* _tmp12_ = NULL;
 		FILE* _tmp13_ = NULL;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = stderr;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp7_ = e;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = _tmp7_->message;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp6_, "%s\n", _tmp8_);
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp9_ = stderr;
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp10_ = _ ("Run '%s --help' to see a full list of available command line options.");
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = args;
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11__length1 = args_length1;
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp12_ = _tmp11_[0];
-#line 551 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 551 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp9_, _tmp10_, _tmp12_);
-#line 553 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp13_ = stderr;
-#line 553 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp13_, "\n");
-#line 554 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_FAILURE;
-#line 554 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 554 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
-#line 554 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
 #line 3594 "simple-scan.c"
 	}
 	__finally12:
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 544 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return 0;
 #line 3607 "simple-scan.c"
 	}
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp14_ = simple_scan_show_version;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp14_) {
 #line 3613 "simple-scan.c"
 		FILE* _tmp15_ = NULL;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp15_ = stderr;
-#line 559 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 559 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp15_, "simple-scan %s\n", VERSION);
-#line 560 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_SUCCESS;
-#line 560 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
-#line 560 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
 #line 3625 "simple-scan.c"
 	}
-#line 562 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp16_ = simple_scan_fix_pdf_filename;
-#line 562 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp16_ != NULL) {
 #line 3631 "simple-scan.c"
 		{
 			const gchar* _tmp17_ = NULL;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp17_ = simple_scan_fix_pdf_filename;
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			simple_scan_fix_pdf (_tmp17_, &_inner_error_);
-#line 566 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3640 "simple-scan.c"
 				goto __catch13_g_error;
 			}
 			{
 				gint i = 0;
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				i = 1;
 #line 3647 "simple-scan.c"
 				{
 					gboolean _tmp18_ = FALSE;
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp18_ = TRUE;
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					while (TRUE) {
 #line 3654 "simple-scan.c"
 						gint _tmp20_ = 0;
@@ -3659,41 +3659,41 @@ gint simple_scan_main (gchar** args, int args_length1) {
 						gint _tmp22__length1 = 0;
 						gint _tmp23_ = 0;
 						const gchar* _tmp24_ = NULL;
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (!_tmp18_) {
 #line 3664 "simple-scan.c"
 							gint _tmp19_ = 0;
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							_tmp19_ = i;
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							i = _tmp19_ + 1;
 #line 3670 "simple-scan.c"
 						}
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp18_ = FALSE;
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp20_ = i;
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp21_ = args;
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp21__length1 = args_length1;
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (!(_tmp20_ < _tmp21__length1)) {
-#line 567 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							break;
 #line 3684 "simple-scan.c"
 						}
-#line 568 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp22_ = args;
-#line 568 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp22__length1 = args_length1;
-#line 568 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp23_ = i;
-#line 568 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp24_ = _tmp22_[_tmp23_];
-#line 568 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						simple_scan_fix_pdf (_tmp24_, &_inner_error_);
-#line 568 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3698 "simple-scan.c"
 							goto __catch13_g_error;
@@ -3709,56 +3709,56 @@ gint simple_scan_main (gchar** args, int args_length1) {
 			FILE* _tmp25_ = NULL;
 			GError* _tmp26_ = NULL;
 			const gchar* _tmp27_ = NULL;
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			e = _inner_error_;
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_inner_error_ = NULL;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp25_ = stderr;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp26_ = e;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp27_ = _tmp26_->message;
-#line 572 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			fprintf (_tmp25_, "Error fixing PDF file: %s", _tmp27_);
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			result = EXIT_FAILURE;
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_error_free0 (e);
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_option_context_free0 (c);
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			return result;
 #line 3732 "simple-scan.c"
 		}
 		__finally13:
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_option_context_free0 (c);
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.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 564 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			g_clear_error (&_inner_error_);
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			return 0;
 #line 3745 "simple-scan.c"
 		}
-#line 575 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_SUCCESS;
-#line 575 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
-#line 575 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
 #line 3753 "simple-scan.c"
 	}
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	device = NULL;
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp28_ = args;
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp28__length1 = args_length1;
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp28__length1 > 1) {
 #line 3763 "simple-scan.c"
 		ScanDevice* _tmp29_ = NULL;
@@ -3772,103 +3772,103 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		gint _tmp35__length1 = 0;
 		const gchar* _tmp36_ = NULL;
 		gchar* _tmp37_ = NULL;
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp29_ = scan_device_new ();
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_scan_device_unref0 (device);
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		device = _tmp29_;
-#line 582 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp30_ = device;
-#line 582 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp31_ = args;
-#line 582 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp31__length1 = args_length1;
-#line 582 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp32_ = _tmp31_[1];
-#line 582 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp33_ = g_strdup (_tmp32_);
-#line 582 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (_tmp30_->name);
-#line 582 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp30_->name = _tmp33_;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp34_ = device;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp35_ = args;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp35__length1 = args_length1;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp36_ = _tmp35_[1];
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp37_ = g_strdup (_tmp36_);
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (_tmp34_->label);
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp34_->label = _tmp37_;
 #line 3809 "simple-scan.c"
 	}
-#line 587 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp38_ = g_timer_new ();
-#line 587 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_timer_destroy0 (simple_scan_log_timer);
-#line 587 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_log_timer = _tmp38_;
-#line 588 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp39_ = g_get_user_cache_dir ();
-#line 588 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp40_ = g_build_filename (_tmp39_, "simple-scan", NULL, NULL);
-#line 588 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	path = _tmp40_;
-#line 589 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp41_ = path;
-#line 589 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_mkdir_with_parents (_tmp41_, 0700);
-#line 590 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp42_ = g_get_user_cache_dir ();
-#line 590 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp43_ = g_build_filename (_tmp42_, "simple-scan", "simple-scan.log", NULL, NULL);
-#line 590 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (path);
-#line 590 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	path = _tmp43_;
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp44_ = path;
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp45_ = g_fopen (_tmp44_, "w");
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_fclose0 (simple_scan_log_file);
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_log_file = _tmp45_;
-#line 592 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_log_set_default_handler (_simple_scan_log_cb_glog_func, NULL);
-#line 594 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp46_ = getpid ();
-#line 594 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_debug ("simple-scan.vala:594: Starting Simple Scan %s, PID=%i", VERSION, (gint) _tmp46_);
-#line 596 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	gtk_init (&args_length1, &args);
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp47_ = device;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp48_ = simple_scan_new (_tmp47_);
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	app = _tmp48_;
-#line 599 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp49_ = app;
-#line 599 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp50_ = g_application_run ((GApplication*) _tmp49_, 0, NULL);
-#line 599 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	result = _tmp50_;
-#line 599 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (app);
-#line 599 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (path);
-#line 599 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_scan_device_unref0 (device);
-#line 599 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_option_context_free0 (c);
-#line 599 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
 #line 3873 "simple-scan.c"
 }
@@ -3878,35 +3878,35 @@ int main (int argc, char ** argv) {
 #if !GLIB_CHECK_VERSION (2,35,0)
 	g_type_init ();
 #endif
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return simple_scan_main (argv, argc);
 #line 3883 "simple-scan.c"
 }
 
 
 static void simple_scan_class_init (SimpleScanClass * klass) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_parent_class = g_type_class_peek_parent (klass);
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_type_class_add_private (klass, sizeof (SimpleScanPrivate));
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	((GApplicationClass *) klass)->startup = simple_scan_real_startup;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	((GApplicationClass *) klass)->activate = simple_scan_real_activate;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	((GApplicationClass *) klass)->shutdown = simple_scan_real_shutdown;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_OBJECT_CLASS (klass)->finalize = simple_scan_finalize;
 #line 3900 "simple-scan.c"
 }
 
 
 static void simple_scan_instance_init (SimpleScan * self) {
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv = SIMPLE_SCAN_GET_PRIVATE (self);
-#line 32 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->default_device = NULL;
-#line 33 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 33 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->have_devices = FALSE;
 #line 3911 "simple-scan.c"
 }
@@ -3914,19 +3914,19 @@ static void simple_scan_instance_init (SimpleScan * self) {
 
 static void simple_scan_finalize (GObject* obj) {
 	SimpleScan * self;
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SIMPLE_SCAN, SimpleScan);
-#line 32 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 32 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_scan_device_unref0 (self->priv->default_device);
-#line 34 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 34 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (self->priv->udev_client);
-#line 35 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 35 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (self->priv->ui);
-#line 36 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_scanner_unref0 (self->priv->scanner);
-#line 37 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 37 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_book_unref0 (self->priv->book);
-#line 12 "/home/bob/bzr/simple-scan/3.16/src/simple-scan.vala"
+#line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_OBJECT_CLASS (simple_scan_parent_class)->finalize (obj);
 #line 3931 "simple-scan.c"
 }
diff --git a/src/ui.c b/src/ui.c
index d2a437c..6c6e8b5 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -685,98 +685,98 @@ static gint _vala_array_length (gpointer array);
 static const GActionEntry USER_INTERFACE_action_entries[10] = {{"new_document", _user_interface_new_document_activate_cb_gsimple_action_activate_callback}, {"reorder", _user_interface_reorder_document_activate_cb_gsimple_action_activate_callback}, {"save", _user_interface_save_document_activate_cb_gsimple_action_activate_callback}, {"save_as", _user_interface_save_as_document_activate_cb_gsimple_action_activate_callback}, {"email", _user_interface_email_document_activate_cb_gsimple_action_activate_callback}, {"print", _user_interface_print_document_activate_cb_gsimple_action_activate_callback}, {"preferences", _user_interface_preferences_activate_cb_gsimple_action_activate_callback}, {"help", _user_interface_help_contents_activate_cb_gsimple_action_activate_callback}, {"about", _user_interface_about_activate_cb_gsimple_action_activate_callback}, {"quit", _user_interface_quit_activate_cb_gsimple_action_activate_callback}};
 
 static void _user_interface_page_added_cb_book_page_added (Book* _sender, Page* page, gpointer self) {
-#line 286 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_added_cb ((UserInterface*) self, _sender, page);
 #line 691 "ui.c"
 }
 
 
 static void _user_interface_reordered_cb_book_reordered (Book* _sender, gpointer self) {
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reordered_cb ((UserInterface*) self, _sender);
 #line 698 "ui.c"
 }
 
 
 static void _user_interface_page_removed_cb_book_page_removed (Book* _sender, Page* page, gpointer self) {
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_removed_cb ((UserInterface*) self, _sender, page);
 #line 705 "ui.c"
 }
 
 
 static void _user_interface_new_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document_activate_cb ((UserInterface*) self);
 #line 712 "ui.c"
 }
 
 
 static void _user_interface_reorder_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document_activate_cb ((UserInterface*) self);
 #line 719 "ui.c"
 }
 
 
 static void _user_interface_save_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document_activate_cb ((UserInterface*) self);
 #line 726 "ui.c"
 }
 
 
 static void _user_interface_save_as_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_as_document_activate_cb ((UserInterface*) self);
 #line 733 "ui.c"
 }
 
 
 static void _user_interface_email_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_email_document_activate_cb ((UserInterface*) self);
 #line 740 "ui.c"
 }
 
 
 static void _user_interface_print_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document_activate_cb ((UserInterface*) self);
 #line 747 "ui.c"
 }
 
 
 static void _user_interface_preferences_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_preferences_activate_cb ((UserInterface*) self);
 #line 754 "ui.c"
 }
 
 
 static void _user_interface_help_contents_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_help_contents_activate_cb ((UserInterface*) self);
 #line 761 "ui.c"
 }
 
 
 static void _user_interface_about_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_about_activate_cb ((UserInterface*) self);
 #line 768 "ui.c"
 }
 
 
 static void _user_interface_quit_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 19 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_quit_activate_cb ((UserInterface*) self);
 #line 775 "ui.c"
 }
 
 
 static void _user_interface_needs_saving_cb_book_needs_saving_changed (Book* _sender, gpointer self) {
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_needs_saving_cb ((UserInterface*) self, _sender);
 #line 782 "ui.c"
 }
@@ -798,71 +798,71 @@ UserInterface* user_interface_construct (GType object_type) {
 	Book* _tmp11_ = NULL;
 	guint _tmp12_ = 0U;
 	guint _tmp13_ = 0U;
-#line 259 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (UserInterface*) g_object_new (object_type, NULL);
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_settings_new ("org.gnome.SimpleScan");
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->settings);
-#line 261 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->settings = _tmp0_;
-#line 263 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_new ();
-#line 263 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 263 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_book (self, _tmp2_);
-#line 263 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_book_unref0 (_tmp2_);
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->_book;
-#line 264 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp3_, "page-added", (GCallback) _user_interface_page_added_cb_book_page_added, self, 0);
-#line 265 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->_book;
-#line 265 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp4_, "reordered", (GCallback) _user_interface_reordered_cb_book_reordered, self, 0);
-#line 266 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->_book;
-#line 266 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp5_, "page-removed", (GCallback) _user_interface_page_removed_cb_book_page_removed, self, 0);
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->_book;
-#line 267 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp6_, "needs-saving-changed", (GCallback) _user_interface_needs_saving_cb_book_needs_saving_changed, self, 0);
-#line 269 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_load (self);
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = autosave_manager_new ();
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_autosave_manager_unref0 (self->priv->autosave_manager);
-#line 271 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->autosave_manager = _tmp7_;
-#line 272 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->autosave_manager;
-#line 272 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->_book;
-#line 272 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	autosave_manager_set_book (_tmp8_, _tmp9_);
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = self->priv->autosave_manager;
-#line 273 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 273 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	autosave_manager_load (_tmp10_);
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->_book;
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = book_get_n_pages (_tmp11_);
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = _tmp12_;
-#line 275 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp13_ == ((guint) 0)) {
 #line 860 "ui.c"
 		Book* _tmp14_ = NULL;
-#line 277 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_add_default_page (self);
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = self->priv->_book;
-#line 278 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_set_needs_saving (_tmp14_, FALSE);
 #line 868 "ui.c"
 	} else {
@@ -870,28 +870,28 @@ UserInterface* user_interface_construct (GType object_type) {
 		Book* _tmp16_ = NULL;
 		Page* _tmp17_ = NULL;
 		Page* _tmp18_ = NULL;
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = self->priv->book_view;
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = self->priv->_book;
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = book_get_page (_tmp16_, 0);
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp18_ = _tmp17_;
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_view_set_selected_page (_tmp15_, _tmp18_);
-#line 281 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (_tmp18_);
 #line 886 "ui.c"
 	}
-#line 259 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
 #line 890 "ui.c"
 }
 
 
 UserInterface* user_interface_new (void) {
-#line 259 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return user_interface_construct (TYPE_USER_INTERFACE);
 #line 897 "ui.c"
 }
@@ -904,26 +904,26 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 	GtkListStore* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 291 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 291 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (device != NULL, FALSE);
-#line 293 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	have_iter = FALSE;
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->device_model;
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_iter = _tmp1_;
-#line 295 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
 #line 922 "ui.c"
 		{
 			gboolean _tmp3_ = FALSE;
-#line 297 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = TRUE;
-#line 297 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
 #line 929 "ui.c"
 				gchar* d = NULL;
@@ -931,70 +931,70 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 				GtkTreeIter _tmp9_ = {0};
 				const gchar* _tmp10_ = NULL;
 				const gchar* _tmp11_ = NULL;
-#line 297 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp3_) {
 #line 937 "ui.c"
 					gboolean _tmp4_ = FALSE;
 					gboolean _tmp5_ = FALSE;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp5_ = have_iter;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp5_) {
 #line 944 "ui.c"
 						GtkListStore* _tmp6_ = NULL;
 						gboolean _tmp7_ = FALSE;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp6_ = self->priv->device_model;
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp7_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp6_, &_vala_iter);
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp4_ = _tmp7_;
 #line 953 "ui.c"
 					} else {
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp4_ = FALSE;
 #line 957 "ui.c"
 					}
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp4_) {
-#line 303 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
 #line 963 "ui.c"
 					}
 				}
-#line 297 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp3_ = FALSE;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = self->priv->device_model;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = _vala_iter;
-#line 300 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_tree_model_get ((GtkTreeModel*) _tmp8_, &_tmp9_, 0, &d, -1, -1);
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp10_ = d;
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp11_ = device;
-#line 301 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp10_, _tmp11_) == 0) {
-#line 302 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					have_iter = TRUE;
 #line 982 "ui.c"
 				}
-#line 297 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (d);
 #line 986 "ui.c"
 			}
 		}
 	}
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = have_iter;
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (iter) {
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*iter = _vala_iter;
 #line 996 "ui.c"
 	}
-#line 306 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 1000 "ui.c"
 }
@@ -1006,31 +1006,31 @@ static void user_interface_show_error_dialog (UserInterface* self, const gchar*
 	GtkMessageDialog* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_title != NULL);
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_text != NULL);
-#line 311 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = error_title;
-#line 311 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp0_);
-#line 311 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
-#line 311 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dialog = _tmp1_;
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _ ("_Close");
-#line 316 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_add_button ((GtkDialog*) dialog, _tmp2_, 0);
-#line 317 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = error_text;
-#line 317 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_message_dialog_format_secondary_text (dialog, "%s", _tmp3_);
-#line 318 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) dialog);
-#line 309 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
 #line 1036 "ui.c"
 }
@@ -1057,85 +1057,85 @@ void user_interface_authorize (UserInterface* self, const gchar* resource, gchar
 	const gchar* _tmp14_ = NULL;
 	const gchar* _tmp15_ = NULL;
 	gchar* _tmp16_ = NULL;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (resource != NULL);
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Username and password required to access '%s'");
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = resource;
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 324 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	description = _tmp2_;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->username_entry;
-#line 326 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_entry_set_text (_tmp3_, "");
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->password_entry;
-#line 327 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_entry_set_text (_tmp4_, "");
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->authorize_label;
-#line 328 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_text (_tmp5_, description);
-#line 330 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->authorize_dialog;
-#line 330 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp6_, TRUE);
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = self->priv->authorize_dialog;
-#line 331 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_run (_tmp7_);
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->authorize_dialog;
-#line 332 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp8_, FALSE);
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->username_entry;
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = gtk_entry_get_text (_tmp9_);
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = _tmp10_;
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = g_strdup (_tmp11_);
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_vala_username);
-#line 334 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_username = _tmp12_;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->password_entry;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = gtk_entry_get_text (_tmp13_);
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = _tmp14_;
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = g_strdup (_tmp15_);
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_vala_password);
-#line 335 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_password = _tmp16_;
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (description);
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (username) {
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*username = _vala_username;
 #line 1127 "ui.c"
 	} else {
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_username);
 #line 1131 "ui.c"
 	}
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (password) {
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*password = _vala_password;
 #line 1137 "ui.c"
 	} else {
-#line 321 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_password);
 #line 1141 "ui.c"
 	}
@@ -1148,48 +1148,48 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 339 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->setting_devices;
-#line 341 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 342 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 1162 "ui.c"
 	}
-#line 343 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->user_selected_device = TRUE;
-#line 344 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_selected_device (self);
-#line 344 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 344 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 344 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _tmp3_ != NULL;
-#line 344 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp3_);
-#line 344 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
 #line 1178 "ui.c"
 		GSettings* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->settings;
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = user_interface_get_selected_device (self);
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_;
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_settings_set_string (_tmp5_, "selected-device", _tmp8_);
-#line 345 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp8_);
 #line 1195 "ui.c"
 	}
@@ -1197,7 +1197,7 @@ static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidg
 
 
 static void _user_interface_device_combo_changed_cb_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_device_combo_changed_cb ((UserInterface*) self, _sender);
 #line 1203 "ui.c"
 }
@@ -1226,15 +1226,15 @@ static void user_interface_update_info_bar (UserInterface* self) {
 	GtkButton* _tmp26_ = NULL;
 	gboolean _tmp27_ = FALSE;
 	GtkInfoBar* _tmp28_ = NULL;
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 352 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	show_close_button = FALSE;
-#line 353 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	show_change_scanner_button = FALSE;
-#line 355 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->have_error;
-#line 355 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
 #line 1240 "ui.c"
 		gchar* _tmp1_ = NULL;
@@ -1243,45 +1243,45 @@ static void user_interface_update_info_bar (UserInterface* self) {
 		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 357 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		type = GTK_MESSAGE_ERROR;
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = g_strdup ("dialog-error");
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (image_id);
-#line 358 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		image_id = _tmp1_;
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = self->priv->error_title;
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = g_strdup (_tmp2_);
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (title);
-#line 359 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		title = _tmp3_;
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->error_text;
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_strdup (_tmp4_);
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (text);
-#line 360 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		text = _tmp5_;
-#line 361 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		show_close_button = TRUE;
-#line 362 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = self->priv->error_change_scanner_hint;
-#line 362 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		show_change_scanner_button = _tmp6_;
 #line 1277 "ui.c"
 	} else {
 		GtkListStore* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
-#line 364 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = self->priv->device_model;
-#line 364 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = gtk_tree_model_iter_n_children ((GtkTreeModel*) _tmp7_, NULL);
-#line 364 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp8_ == 0) {
 #line 1287 "ui.c"
 			gchar* _tmp9_ = NULL;
@@ -1289,104 +1289,104 @@ static void user_interface_update_info_bar (UserInterface* self) {
 			gchar* _tmp11_ = NULL;
 			const gchar* _tmp12_ = NULL;
 			gchar* _tmp13_ = NULL;
-#line 366 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			type = GTK_MESSAGE_WARNING;
-#line 367 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = g_strdup ("dialog-warning");
-#line 367 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (image_id);
-#line 367 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			image_id = _tmp9_;
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = _ ("No scanners detected");
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = g_strdup (_tmp10_);
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (title);
-#line 369 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			title = _tmp11_;
-#line 371 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp12_ = _ ("Please check your scanner is connected and powered on");
-#line 371 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp13_ = g_strdup (_tmp12_);
-#line 371 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (text);
-#line 371 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			text = _tmp13_;
 #line 1317 "ui.c"
 		} else {
 			GtkInfoBar* _tmp14_ = NULL;
-#line 375 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp14_ = self->priv->info_bar;
-#line 375 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_widget_set_visible ((GtkWidget*) _tmp14_, FALSE);
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (image_id);
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (text);
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (title);
-#line 376 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return;
 #line 1332 "ui.c"
 		}
 	}
-#line 379 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->info_bar;
-#line 379 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = type;
-#line 379 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_info_bar_set_message_type (_tmp15_, _tmp16_);
-#line 380 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->info_bar_image;
-#line 380 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = image_id;
-#line 380 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_image_set_from_icon_name (_tmp17_, _tmp18_, GTK_ICON_SIZE_DIALOG);
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = title;
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = text;
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = g_strdup_printf ("<big><b>%s</b></big>\n\n%s", _tmp19_, _tmp20_);
-#line 381 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	message = _tmp21_;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = self->priv->info_bar_label;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = message;
-#line 382 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_markup (_tmp22_, _tmp23_);
-#line 383 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = self->priv->info_bar_close_button;
-#line 383 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = show_close_button;
-#line 383 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp24_, _tmp25_);
-#line 384 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = self->priv->info_bar_change_scanner_button;
-#line 384 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = show_change_scanner_button;
-#line 384 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp26_, _tmp27_);
-#line 385 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = self->priv->info_bar;
-#line 385 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp28_, TRUE);
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (image_id);
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (text);
-#line 348 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (title);
 #line 1385 "ui.c"
 }
 
 
 static gpointer _scan_device_ref0 (gpointer self) {
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? scan_device_ref (self) : NULL;
 #line 1392 "ui.c"
 }
@@ -1400,48 +1400,48 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 	GList* _tmp4_ = NULL;
 	gboolean _tmp51_ = FALSE;
 	gboolean _tmp52_ = FALSE;
-#line 388 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 390 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	have_selection = FALSE;
-#line 394 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->setting_devices = TRUE;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->user_selected_device;
-#line 397 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
 #line 1414 "ui.c"
 		GtkComboBox* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
-#line 398 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = self->priv->device_combo;
-#line 398 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_combo_box_get_active (_tmp1_);
-#line 398 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _tmp2_;
-#line 398 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_selection = _tmp3_ >= 0;
 #line 1426 "ui.c"
 	}
-#line 401 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = 0;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = devices;
 #line 1432 "ui.c"
 	{
 		GList* device_collection = NULL;
 		GList* device_it = NULL;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		device_collection = _tmp4_;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
 #line 1440 "ui.c"
 			ScanDevice* _tmp5_ = NULL;
 			ScanDevice* device = NULL;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp5_ = _scan_device_ref0 ((ScanDevice*) device_it->data);
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			device = _tmp5_;
 #line 1447 "ui.c"
 			{
@@ -1452,28 +1452,28 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 				gboolean _tmp9_ = FALSE;
 				gint _tmp21_ = 0;
 				gint _tmp44_ = 0;
-#line 404 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				n_delete = -1;
-#line 407 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp6_ = self->priv->device_model;
-#line 407 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = index;
-#line 407 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp6_, &_tmp8_, NULL, _tmp7_);
-#line 407 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				iter = _tmp8_;
-#line 407 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp9_) {
 #line 1468 "ui.c"
 					gint i = 0;
-#line 409 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					i = 0;
 #line 1472 "ui.c"
 					{
 						gboolean _tmp10_ = FALSE;
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp10_ = TRUE;
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						while (TRUE) {
 #line 1479 "ui.c"
 							gchar* name = NULL;
@@ -1485,67 +1485,67 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 							const gchar* _tmp17_ = NULL;
 							gboolean _tmp18_ = FALSE;
 							gint _tmp20_ = 0;
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!_tmp10_) {
 #line 1491 "ui.c"
 								GtkListStore* _tmp11_ = NULL;
 								gboolean _tmp12_ = FALSE;
-#line 424 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp11_ = self->priv->device_model;
-#line 424 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp12_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp11_, &iter);
-#line 424 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								if (!_tmp12_) {
-#line 424 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									break;
 #line 1502 "ui.c"
 								}
 							}
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp10_ = FALSE;
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp13_ = self->priv->device_model;
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp14_ = iter;
-#line 415 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							gtk_tree_model_get ((GtkTreeModel*) _tmp13_, &_tmp14_, 0, &name, -1, -1);
-#line 416 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp15_ = name;
-#line 416 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp16_ = device;
-#line 416 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp17_ = _tmp16_->name;
-#line 416 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							matched = g_strcmp0 (_tmp15_, _tmp17_) == 0;
-#line 418 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp18_ = matched;
-#line 418 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (_tmp18_) {
 #line 1525 "ui.c"
 								gint _tmp19_ = 0;
-#line 420 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp19_ = i;
-#line 420 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								n_delete = _tmp19_;
-#line 421 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_g_free0 (name);
-#line 421 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
 #line 1535 "ui.c"
 							}
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp20_ = i;
-#line 423 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							i = _tmp20_ + 1;
-#line 410 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (name);
 #line 1543 "ui.c"
 						}
 					}
 				}
-#line 428 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = n_delete;
-#line 428 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp21_ >= 0) {
 #line 1551 "ui.c"
 					gint i = 0;
@@ -1553,24 +1553,24 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 					GtkTreeIter _tmp23_ = {0};
 					ScanDevice* _tmp24_ = NULL;
 					const gchar* _tmp25_ = NULL;
-#line 433 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = self->priv->device_model;
-#line 433 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp23_ = iter;
-#line 433 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp24_ = device;
-#line 433 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp25_ = _tmp24_->label;
-#line 433 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_list_store_set (_tmp22_, &_tmp23_, 1, _tmp25_, -1, -1);
 #line 1567 "ui.c"
 					{
 						gboolean _tmp26_ = FALSE;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						i = 0;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp26_ = TRUE;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						while (TRUE) {
 #line 1576 "ui.c"
 							gint _tmp28_ = 0;
@@ -1580,41 +1580,41 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 							GtkTreeIter _tmp32_ = {0};
 							GtkListStore* _tmp33_ = NULL;
 							GtkTreeIter _tmp34_ = {0};
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!_tmp26_) {
 #line 1586 "ui.c"
 								gint _tmp27_ = 0;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp27_ = i;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								i = _tmp27_ + 1;
 #line 1592 "ui.c"
 							}
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp26_ = FALSE;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp28_ = i;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp29_ = n_delete;
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!(_tmp28_ < _tmp29_)) {
-#line 435 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
 #line 1604 "ui.c"
 							}
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp30_ = self->priv->device_model;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp31_ = index;
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp30_, &_tmp32_, NULL, _tmp31_);
-#line 437 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							iter = _tmp32_;
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp33_ = self->priv->device_model;
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp34_ = iter;
-#line 438 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							gtk_list_store_remove (_tmp33_, &_tmp34_);
 #line 1620 "ui.c"
 						}
@@ -1629,41 +1629,41 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 					const gchar* _tmp41_ = NULL;
 					ScanDevice* _tmp42_ = NULL;
 					const gchar* _tmp43_ = NULL;
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp35_ = self->priv->device_model;
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp36_ = index;
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_list_store_insert (_tmp35_, &_tmp37_, _tmp36_);
-#line 443 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					iter = _tmp37_;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp38_ = self->priv->device_model;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp39_ = iter;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp40_ = device;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp41_ = _tmp40_->name;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp42_ = device;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp43_ = _tmp42_->label;
-#line 444 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_list_store_set (_tmp38_, &_tmp39_, 0, _tmp41_, 1, _tmp43_, -1, -1);
 #line 1655 "ui.c"
 				}
-#line 446 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp44_ = index;
-#line 446 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				index = _tmp44_ + 1;
-#line 402 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_scan_device_unref0 (device);
 #line 1663 "ui.c"
 			}
 		}
 	}
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
 #line 1669 "ui.c"
 		GtkListStore* _tmp45_ = NULL;
@@ -1672,57 +1672,57 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 		gboolean _tmp48_ = FALSE;
 		GtkListStore* _tmp49_ = NULL;
 		GtkTreeIter _tmp50_ = {0};
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp45_ = self->priv->device_model;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp46_ = index;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp48_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp45_, &_tmp47_, NULL, _tmp46_);
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp47_;
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!_tmp48_) {
-#line 450 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
 #line 1688 "ui.c"
 		}
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp49_ = self->priv->device_model;
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp50_ = iter;
-#line 451 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_list_store_remove (_tmp49_, &_tmp50_);
 #line 1696 "ui.c"
 	}
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp52_ = have_selection;
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp52_) {
 #line 1702 "ui.c"
 		GList* _tmp53_ = NULL;
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp53_ = devices;
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp51_ = _tmp53_ != NULL;
 #line 1708 "ui.c"
 	} else {
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp51_ = FALSE;
 #line 1712 "ui.c"
 	}
-#line 454 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp51_) {
 #line 1716 "ui.c"
 		GtkComboBox* _tmp54_ = NULL;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp54_ = self->priv->device_combo;
-#line 455 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_combo_box_set_active (_tmp54_, 0);
 #line 1722 "ui.c"
 	}
-#line 457 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->setting_devices = FALSE;
-#line 459 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
 #line 1728 "ui.c"
 }
@@ -1737,29 +1737,29 @@ static void user_interface_add_default_page (UserInterface* self) {
 	Page* _tmp4_ = NULL;
 	Book* _tmp5_ = NULL;
 	BookView* _tmp6_ = NULL;
-#line 462 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 464 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->default_page_width;
-#line 464 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->default_page_height;
-#line 464 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->default_page_dpi;
-#line 464 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->default_page_scan_direction;
-#line 464 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_new (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 464 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp4_;
-#line 468 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->_book;
-#line 468 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_append_page (_tmp5_, page);
-#line 469 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->book_view;
-#line 469 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_view_set_selected_page (_tmp6_, page);
-#line 462 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
 #line 1765 "ui.c"
 }
@@ -1943,82 +1943,82 @@ static void user_interface_on_file_type_changed (UserInterface* self, GtkTreeSel
 	gchar* _tmp14_ = NULL;
 	GtkFileChooserDialog* _tmp15_ = NULL;
 	const gchar* _tmp16_ = NULL;
-#line 472 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 472 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (selection != NULL);
-#line 474 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = selection;
-#line 474 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_selected_extension (self, _tmp0_);
-#line 474 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extension = _tmp1_;
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->save_dialog;
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp2_);
-#line 475 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	path = _tmp3_;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = path;
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = g_path_get_basename (_tmp4_);
-#line 476 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp5_;
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = filename;
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = string_last_index_of_char (_tmp6_, (gunichar) '.', 0);
-#line 479 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extension_index = _tmp7_;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = extension_index;
-#line 480 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp8_ >= 0) {
 #line 1979 "ui.c"
 		const gchar* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
 		gchar* _tmp11_ = NULL;
-#line 481 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = filename;
-#line 481 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = extension_index;
-#line 481 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = string_slice (_tmp9_, (glong) 0, (glong) _tmp10_);
-#line 481 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 481 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		filename = _tmp11_;
 #line 1993 "ui.c"
 	}
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = filename;
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = extension;
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = g_strconcat (_tmp12_, _tmp13_, NULL);
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 482 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp14_;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->save_dialog;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = filename;
-#line 483 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp15_, _tmp16_);
-#line 472 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 472 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (path);
-#line 472 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (extension);
 #line 2017 "ui.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? g_object_ref (self) : NULL;
 #line 2024 "ui.c"
 }
@@ -2035,44 +2035,44 @@ static gchar* user_interface_get_selected_extension (UserInterface* self, GtkTre
 	GtkTreeIter _tmp3_ = {0};
 	gboolean _tmp4_ = FALSE;
 	GtkTreeModel* _tmp5_ = NULL;
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 486 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (selection != NULL, NULL);
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("");
-#line 490 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extension = _tmp0_;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = selection;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = gtk_tree_selection_get_selected (_tmp1_, &_tmp2_, &_tmp3_);
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (model);
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _g_object_ref0 (_tmp2_);
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	model = _tmp5_;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp3_;
-#line 492 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
 #line 2061 "ui.c"
 		GtkTreeModel* _tmp6_ = NULL;
 		GtkTreeIter _tmp7_ = {0};
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = model;
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = iter;
-#line 493 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get (_tmp6_, &_tmp7_, 1, &extension, -1, -1);
 #line 2070 "ui.c"
 	}
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = extension;
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (model);
-#line 494 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 2078 "ui.c"
 }
@@ -2247,7 +2247,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 
 
 static void _user_interface_on_file_type_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self) {
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_file_type_changed ((UserInterface*) self, _sender);
 #line 2253 "ui.c"
 }
@@ -2349,288 +2349,288 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	GtkTreeSelection* _tmp115_ = NULL;
 	guint _tmp116_ = 0U;
 	GtkFileChooserDialog* _tmp117_ = NULL;
-#line 497 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 500 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	directory = NULL;
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_settings_get_string (_tmp0_, "save-directory");
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (directory);
-#line 501 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	directory = _tmp1_;
-#line 503 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = directory;
-#line 503 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_ == NULL) {
-#line 503 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = TRUE;
 #line 2371 "ui.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
-#line 503 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = directory;
-#line 503 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") == 0;
 #line 2378 "ui.c"
 	}
-#line 503 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
 #line 2382 "ui.c"
 		const gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 504 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
-#line 504 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = g_strdup (_tmp5_);
-#line 504 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (directory);
-#line 504 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		directory = _tmp6_;
 #line 2393 "ui.c"
 	}
-#line 506 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _ ("Save As...");
-#line 506 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("_Cancel");
-#line 506 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = _ ("_Save");
-#line 506 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp7_, (GtkWindow*) self, GTK_FILE_CHOOSER_ACTION_SAVE, _tmp8_, GTK_RESPONSE_CANCEL, _tmp9_, GTK_RESPONSE_ACCEPT, NULL, NULL);
-#line 506 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp10_);
-#line 506 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_dialog);
-#line 506 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_dialog = _tmp10_;
-#line 513 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->save_dialog;
-#line 513 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_do_overwrite_confirmation ((GtkFileChooser*) _tmp11_, TRUE);
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = self->priv->save_dialog;
-#line 514 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_local_only ((GtkFileChooser*) _tmp12_, FALSE);
-#line 515 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->save_dialog;
-#line 515 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = directory;
-#line 515 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_current_folder ((GtkFileChooser*) _tmp13_, _tmp14_);
-#line 516 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->save_dialog;
-#line 516 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = self->priv->_default_file_name;
-#line 516 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp15_, _tmp16_);
-#line 519 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = gtk_file_filter_new ();
-#line 519 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp17_);
-#line 519 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filter = _tmp17_;
-#line 520 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = filter;
-#line 520 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = _ ("Image Files");
-#line 520 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_set_name (_tmp18_, _tmp19_);
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = filter;
-#line 522 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_add_pixbuf_formats (_tmp20_);
-#line 523 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = filter;
-#line 523 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_add_mime_type (_tmp21_, "application/pdf");
-#line 524 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = self->priv->save_dialog;
-#line 524 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = filter;
-#line 524 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 524 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp22_, _tmp24_);
-#line 525 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = gtk_file_filter_new ();
-#line 525 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp25_);
-#line 525 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (filter);
-#line 525 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filter = _tmp25_;
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = filter;
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = _ ("All Files");
-#line 526 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_set_name (_tmp26_, _tmp27_);
-#line 528 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = filter;
-#line 528 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_filter_add_pattern (_tmp28_, "*");
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = self->priv->save_dialog;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = filter;
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = _g_object_ref0 (_tmp30_);
-#line 529 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp29_, _tmp31_);
-#line 531 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = _ ("Select File _Type");
-#line 531 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = (GtkExpander*) gtk_expander_new_with_mnemonic (_tmp32_);
-#line 531 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp33_);
-#line 531 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	expander = _tmp33_;
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp34_ = expander;
-#line 533 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_expander_set_spacing (_tmp34_, 5);
-#line 534 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = self->priv->save_dialog;
-#line 534 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp36_ = expander;
-#line 534 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_extra_widget ((GtkFileChooser*) _tmp35_, (GtkWidget*) _tmp36_);
-#line 536 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp37_ = g_strdup ("");
-#line 536 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	default_extension = _tmp37_;
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = self->priv->_default_file_name;
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp39_ = string_last_index_of_char (_tmp38_, (gunichar) '.', 0);
-#line 537 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = _tmp39_;
-#line 538 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp40_ = index;
-#line 538 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp40_ >= 0) {
 #line 2515 "ui.c"
 		const gchar* _tmp41_ = NULL;
 		gint _tmp42_ = 0;
 		gchar* _tmp43_ = NULL;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp41_ = self->priv->_default_file_name;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp42_ = index;
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp43_ = string_substring (_tmp41_, (glong) _tmp42_, (glong) (-1));
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (default_extension);
-#line 539 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		default_extension = _tmp43_;
 #line 2529 "ui.c"
 	}
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp44_ = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING, -1);
-#line 541 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file_type_store = _tmp44_;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp45_ = file_type_store;
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp45_, &_tmp46_);
-#line 543 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp46_;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp47_ = file_type_store;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp48_ = iter;
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp49_ = _ ("PDF (multi-page document)");
-#line 544 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp47_, &_tmp48_, 0, _tmp49_, 1, ".pdf", -1, -1);
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp50_ = file_type_store;
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp50_, &_tmp51_);
-#line 549 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp51_;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp52_ = file_type_store;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp53_ = iter;
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp54_ = _ ("JPEG (compressed)");
-#line 550 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp52_, &_tmp53_, 0, _tmp54_, 1, ".jpg", -1, -1);
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp55_ = file_type_store;
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp55_, &_tmp56_);
-#line 555 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp56_;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp57_ = file_type_store;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp58_ = iter;
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp59_ = _ ("PNG (lossless)");
-#line 556 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp57_, &_tmp58_, 0, _tmp59_, 1, ".png", -1, -1);
-#line 562 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp60_ = file_type_store;
-#line 562 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp61_ = (GtkTreeView*) gtk_tree_view_new_with_model ((GtkTreeModel*) _tmp60_);
-#line 562 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp61_);
-#line 562 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file_type_view = _tmp61_;
-#line 563 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp62_ = file_type_view;
-#line 563 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_tree_view_set_headers_visible (_tmp62_, FALSE);
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp63_ = file_type_view;
-#line 564 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_tree_view_set_rules_hint (_tmp63_, TRUE);
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp64_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp64_);
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp65_ = _tmp64_;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp66_ = gtk_tree_view_column_new_with_attributes ("", (GtkCellRenderer*) _tmp65_, "text", 0, NULL, NULL);
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp66_);
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp67_ = _tmp66_;
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (_tmp65_);
-#line 565 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	column = _tmp67_;
-#line 568 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp68_ = file_type_view;
-#line 568 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp69_ = column;
-#line 568 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_tree_view_append_column (_tmp68_, _tmp69_);
-#line 569 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp70_ = expander;
-#line 569 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp71_ = file_type_view;
-#line 569 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) _tmp70_, (GtkWidget*) _tmp71_);
-#line 571 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp72_ = file_type_store;
-#line 571 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp74_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp72_, &_tmp73_);
-#line 571 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp73_;
-#line 571 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp74_) {
 #line 2629 "ui.c"
 		{
 			gboolean _tmp75_ = FALSE;
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp75_ = TRUE;
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
 #line 2636 "ui.c"
 				gchar* e = NULL;
@@ -2638,77 +2638,77 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 				GtkTreeIter _tmp79_ = {0};
 				const gchar* _tmp80_ = NULL;
 				const gchar* _tmp81_ = NULL;
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp75_) {
 #line 2644 "ui.c"
 					GtkListStore* _tmp76_ = NULL;
 					gboolean _tmp77_ = FALSE;
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp76_ = file_type_store;
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp77_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp76_, &iter);
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp77_) {
-#line 579 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
 #line 2655 "ui.c"
 					}
 				}
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp75_ = FALSE;
-#line 576 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp78_ = file_type_store;
-#line 576 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp79_ = iter;
-#line 576 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_tree_model_get ((GtkTreeModel*) _tmp78_, &_tmp79_, 1, &e, -1, -1);
-#line 577 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp80_ = default_extension;
-#line 577 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp81_ = e;
-#line 577 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp80_, _tmp81_) == 0) {
 #line 2672 "ui.c"
 					GtkTreeView* _tmp82_ = NULL;
 					GtkTreeSelection* _tmp83_ = NULL;
 					GtkTreeIter _tmp84_ = {0};
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp82_ = file_type_view;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp83_ = gtk_tree_view_get_selection (_tmp82_);
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp84_ = iter;
-#line 578 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_tree_selection_select_iter (_tmp83_, &_tmp84_);
 #line 2684 "ui.c"
 				}
-#line 573 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (e);
 #line 2688 "ui.c"
 			}
 		}
 	}
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp85_ = file_type_view;
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp86_ = gtk_tree_view_get_selection (_tmp85_);
-#line 581 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp86_, "changed", (GCallback) _user_interface_on_file_type_changed_gtk_tree_selection_changed, self, 0);
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp87_ = expander;
-#line 583 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_show_all ((GtkWidget*) _tmp87_);
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp88_ = self->priv->save_dialog;
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp89_ = gtk_dialog_run ((GtkDialog*) _tmp88_);
-#line 585 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	response = _tmp89_;
-#line 587 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	uri = NULL;
-#line 588 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp90_ = response;
-#line 588 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp90_ == ((gint) GTK_RESPONSE_ACCEPT)) {
 #line 2714 "ui.c"
 		GtkTreeSelection* selection = NULL;
@@ -2732,127 +2732,127 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 		GFile* _tmp107_ = NULL;
 		GFile* _tmp108_ = NULL;
 		gchar* _tmp109_ = NULL;
-#line 590 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp91_ = file_type_view;
-#line 590 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp92_ = gtk_tree_view_get_selection (_tmp91_);
-#line 590 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp93_ = _g_object_ref0 (_tmp92_);
-#line 590 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		selection = _tmp93_;
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp94_ = selection;
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp95_ = user_interface_get_selected_extension (self, _tmp94_);
-#line 591 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		extension = _tmp95_;
-#line 593 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp96_ = self->priv->save_dialog;
-#line 593 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp97_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp96_);
-#line 593 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		path = _tmp97_;
-#line 594 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp98_ = path;
-#line 594 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp99_ = g_path_get_basename (_tmp98_);
-#line 594 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		filename = _tmp99_;
-#line 596 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp100_ = filename;
-#line 596 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp101_ = string_last_index_of_char (_tmp100_, (gunichar) '.', 0);
-#line 596 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		extension_index = _tmp101_;
-#line 597 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp102_ = extension_index;
-#line 597 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp102_ < 0) {
 #line 2772 "ui.c"
 			const gchar* _tmp103_ = NULL;
 			const gchar* _tmp104_ = NULL;
 			gchar* _tmp105_ = NULL;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp103_ = path;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp104_ = extension;
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp105_ = g_strconcat (_tmp103_, _tmp104_, NULL);
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (path);
-#line 598 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			path = _tmp105_;
 #line 2786 "ui.c"
 		}
-#line 600 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp106_ = path;
-#line 600 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp107_ = g_file_new_for_path (_tmp106_);
-#line 600 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp108_ = _tmp107_;
-#line 600 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp109_ = g_file_get_uri (_tmp108_);
-#line 600 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 600 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp109_;
-#line 600 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_tmp108_);
-#line 588 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 588 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 588 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (extension);
-#line 588 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (selection);
 #line 2810 "ui.c"
 	}
-#line 603 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp110_ = self->priv->settings;
-#line 603 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp111_ = self->priv->save_dialog;
-#line 603 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp112_ = gtk_file_chooser_get_current_folder ((GtkFileChooser*) _tmp111_);
-#line 603 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp113_ = _tmp112_;
-#line 603 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_string (_tmp110_, "save-directory", _tmp113_);
-#line 603 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp113_);
-#line 605 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp114_ = file_type_view;
-#line 605 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp115_ = gtk_tree_view_get_selection (_tmp114_);
-#line 605 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("changed", gtk_tree_selection_get_type (), &_tmp116_, NULL, FALSE);
-#line 605 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp115_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp116_, 0, NULL, (GCallback) _user_interface_on_file_type_changed_gtk_tree_selection_changed, self);
-#line 606 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp117_ = self->priv->save_dialog;
-#line 606 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _tmp117_);
-#line 607 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_dialog);
-#line 607 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_dialog = NULL;
-#line 609 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = uri;
-#line 609 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (column);
-#line 609 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file_type_view);
-#line 609 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file_type_store);
-#line 609 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (default_extension);
-#line 609 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (expander);
-#line 609 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (filter);
-#line 609 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (directory);
-#line 609 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 2858 "ui.c"
 }
@@ -2879,171 +2879,171 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	gchar* _tmp39_ = NULL;
 	Book* _tmp40_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 612 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_uri;
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_ != NULL) {
 #line 2889 "ui.c"
 		gboolean _tmp2_ = FALSE;
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = force_choose_location;
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = !_tmp2_;
 #line 2895 "ui.c"
 	} else {
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = FALSE;
 #line 2899 "ui.c"
 	}
-#line 615 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
 #line 2903 "ui.c"
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 616 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->book_uri;
-#line 616 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_strdup (_tmp3_);
-#line 616 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 616 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp4_;
 #line 2914 "ui.c"
 	} else {
 		gchar* _tmp5_ = NULL;
-#line 618 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_choose_file_location (self);
-#line 618 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 618 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		uri = _tmp5_;
 #line 2923 "ui.c"
 	}
-#line 619 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = uri;
-#line 619 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_ == NULL) {
-#line 620 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 620 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 620 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
 #line 2935 "ui.c"
 	}
-#line 622 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = uri;
-#line 622 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = g_file_new_for_uri (_tmp7_);
-#line 622 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file = _tmp8_;
-#line 624 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = uri;
-#line 624 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_debug ("ui.vala:624: Saving to '%s'", _tmp9_);
-#line 626 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = uri;
-#line 626 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = g_utf8_strdown (_tmp10_, (gssize) (-1));
-#line 626 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	uri_lower = _tmp11_;
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = g_strdup ("jpeg");
-#line 627 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	format = _tmp12_;
-#line 628 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = uri_lower;
-#line 628 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = g_str_has_suffix (_tmp13_, ".pdf");
-#line 628 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp14_) {
 #line 2963 "ui.c"
 		gchar* _tmp15_ = NULL;
-#line 629 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = g_strdup ("pdf");
-#line 629 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 629 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		format = _tmp15_;
 #line 2971 "ui.c"
 	} else {
 		const gchar* _tmp16_ = NULL;
 		gboolean _tmp17_ = FALSE;
-#line 630 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = uri_lower;
-#line 630 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = g_str_has_suffix (_tmp16_, ".ps");
-#line 630 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp17_) {
 #line 2981 "ui.c"
 			gchar* _tmp18_ = NULL;
-#line 631 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp18_ = g_strdup ("ps");
-#line 631 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (format);
-#line 631 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			format = _tmp18_;
 #line 2989 "ui.c"
 		} else {
 			const gchar* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
-#line 632 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp19_ = uri_lower;
-#line 632 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp20_ = g_str_has_suffix (_tmp19_, ".png");
-#line 632 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp20_) {
 #line 2999 "ui.c"
 				gchar* _tmp21_ = NULL;
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = g_strdup ("png");
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (format);
-#line 633 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				format = _tmp21_;
 #line 3007 "ui.c"
 			} else {
 				gboolean _tmp22_ = FALSE;
 				const gchar* _tmp23_ = NULL;
 				gboolean _tmp24_ = FALSE;
-#line 634 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp23_ = uri_lower;
-#line 634 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp24_ = g_str_has_suffix (_tmp23_, ".tif");
-#line 634 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp24_) {
-#line 634 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = TRUE;
 #line 3020 "ui.c"
 				} else {
 					const gchar* _tmp25_ = NULL;
 					gboolean _tmp26_ = FALSE;
-#line 634 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp25_ = uri_lower;
-#line 634 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp26_ = g_str_has_suffix (_tmp25_, ".tiff");
-#line 634 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = _tmp26_;
 #line 3030 "ui.c"
 				}
-#line 634 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp22_) {
 #line 3034 "ui.c"
 					gchar* _tmp27_ = NULL;
-#line 635 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp27_ = g_strdup ("tiff");
-#line 635 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (format);
-#line 635 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					format = _tmp27_;
 #line 3042 "ui.c"
 				}
 			}
 		}
 	}
-#line 637 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_progress_dialog (self);
 #line 3049 "ui.c"
 	{
@@ -3052,19 +3052,19 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		gint _tmp30_ = 0;
 		gint _tmp31_ = 0;
 		GFile* _tmp32_ = NULL;
-#line 640 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp28_ = self->priv->_book;
-#line 640 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp29_ = format;
-#line 640 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp30_ = user_interface_get_quality (self);
-#line 640 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = _tmp30_;
-#line 640 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp32_ = file;
-#line 640 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_save (_tmp28_, _tmp29_, _tmp31_, _tmp32_, &_inner_error_);
-#line 640 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3070 "ui.c"
 			goto __catch16_g_error;
@@ -3079,84 +3079,84 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 		const gchar* _tmp35_ = NULL;
 		GError* _tmp36_ = NULL;
 		const gchar* _tmp37_ = NULL;
-#line 638 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 638 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 644 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_hide_progress_dialog (self);
-#line 645 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp33_ = e;
-#line 645 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp34_ = _tmp33_->message;
-#line 645 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_warning ("ui.vala:645: Error saving file: %s", _tmp34_);
-#line 646 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp35_ = _ ("Failed to save file");
-#line 646 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp36_ = e;
-#line 646 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp37_ = _tmp36_->message;
-#line 646 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error (self, _tmp35_, _tmp37_, FALSE);
-#line 650 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 650 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 650 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 650 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri_lower);
-#line 650 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 650 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 650 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
 #line 3117 "ui.c"
 	}
 	__finally16:
-#line 638 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 638 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 638 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri_lower);
-#line 638 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 638 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 638 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.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 638 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 638 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return FALSE;
 #line 3136 "ui.c"
 	}
-#line 653 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = uri;
-#line 653 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp39_ = g_strdup (_tmp38_);
-#line 653 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-#line 653 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_uri = _tmp39_;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp40_ = self->priv->_book;
-#line 654 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_set_needs_saving (_tmp40_, FALSE);
-#line 655 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 655 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (format);
-#line 655 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (uri_lower);
-#line 655 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file);
-#line 655 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (uri);
-#line 655 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 3162 "ui.c"
 }
@@ -3183,122 +3183,122 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 	gint _tmp14_ = 0;
 	GtkMessageDialog* _tmp15_ = NULL;
 	gint _tmp16_ = 0;
-#line 658 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 658 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (title != NULL, FALSE);
-#line 658 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (discard_label != NULL, FALSE);
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_get_needs_saving (_tmp0_);
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 660 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 661 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 661 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
 #line 3205 "ui.c"
 	}
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = title;
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp3_);
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp4_);
-#line 663 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dialog = _tmp4_;
-#line 668 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = dialog;
-#line 668 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _ ("If you don't save, changes will be permanently lost.");
-#line 668 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_message_dialog_format_secondary_text (_tmp5_, "%s", _tmp6_);
-#line 671 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = dialog;
-#line 671 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = discard_label;
-#line 671 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_add_button ((GtkDialog*) _tmp7_, _tmp8_, (gint) GTK_RESPONSE_NO);
-#line 672 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = dialog;
-#line 672 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = _ ("_Cancel");
-#line 672 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_add_button ((GtkDialog*) _tmp9_, _tmp10_, (gint) GTK_RESPONSE_CANCEL);
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = dialog;
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = _ ("_Save");
-#line 673 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_add_button ((GtkDialog*) _tmp11_, _tmp12_, (gint) GTK_RESPONSE_YES);
-#line 675 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = dialog;
-#line 675 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = gtk_dialog_run ((GtkDialog*) _tmp13_);
-#line 675 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	response = _tmp14_;
-#line 676 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = dialog;
-#line 676 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _tmp15_);
-#line 678 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = response;
-#line 678 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (_tmp16_) {
-#line 678 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_YES:
 #line 3255 "ui.c"
 		{
 			gboolean _tmp17_ = FALSE;
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp17_ = user_interface_save_document (self, FALSE);
-#line 681 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp17_) {
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				result = TRUE;
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (dialog);
-#line 682 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
 #line 3268 "ui.c"
 			} else {
-#line 684 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				result = FALSE;
-#line 684 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (dialog);
-#line 684 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
 #line 3276 "ui.c"
 			}
 		}
-#line 678 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_NO:
 #line 3281 "ui.c"
 		{
-#line 686 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			result = TRUE;
-#line 686 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (dialog);
-#line 686 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
 #line 3289 "ui.c"
 		}
 		default:
 		{
-#line 688 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			result = FALSE;
-#line 688 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (dialog);
-#line 688 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
 #line 3299 "ui.c"
 		}
 	}
-#line 658 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
 #line 3304 "ui.c"
 }
@@ -3309,29 +3309,29 @@ static void user_interface_clear_document (UserInterface* self) {
 	Book* _tmp1_ = NULL;
 	GtkMenuItem* _tmp2_ = NULL;
 	GtkMenuItem* _tmp3_ = NULL;
-#line 692 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 694 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 694 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_clear (_tmp0_);
-#line 695 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_add_default_page (self);
-#line 696 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-#line 696 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_uri = NULL;
-#line 697 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 697 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_set_needs_saving (_tmp1_, FALSE);
-#line 698 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->save_as_menuitem;
-#line 698 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp2_, FALSE);
-#line 699 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->copy_to_clipboard_menuitem;
-#line 699 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, FALSE);
 #line 3337 "ui.c"
 }
@@ -3343,58 +3343,58 @@ static void user_interface_new_document (UserInterface* self) {
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 702 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 704 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Save current document?");
-#line 704 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Discard Changes");
-#line 704 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
-#line 704 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 708 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 3359 "ui.c"
 	}
-#line 710 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = user_interface_get_scanning (self);
-#line 710 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _tmp3_;
-#line 710 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 711 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
 #line 3369 "ui.c"
 	}
-#line 712 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_clear_document (self);
 #line 3373 "ui.c"
 }
 
 
 static void user_interface_new_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 716 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 716 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 718 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document (self);
 #line 3384 "ui.c"
 }
 
 
 static void _user_interface_new_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_button_clicked_cb ((UserInterface*) self, _sender);
 #line 3391 "ui.c"
 }
 
 
 void user_interface_new_document_activate_cb (UserInterface* self) {
-#line 721 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 723 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document (self);
 #line 3400 "ui.c"
 }
@@ -3405,76 +3405,76 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar*
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp10_ = FALSE;
-#line 726 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 726 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (document_hint != NULL);
-#line 728 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = document_hint;
-#line 728 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 728 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->document_hint);
-#line 728 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->document_hint = _tmp1_;
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = document_hint;
-#line 730 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp2_, "text") == 0) {
 #line 3425 "ui.c"
 		GtkRadioMenuItem* _tmp3_ = NULL;
 		GtkRadioMenuItem* _tmp4_ = NULL;
 		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 732 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->text_button_menuitem;
-#line 732 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp3_, TRUE);
-#line 733 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->text_button_hb_menuitem;
-#line 733 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 734 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->text_menuitem;
-#line 734 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
 #line 3441 "ui.c"
 	} else {
 		const gchar* _tmp6_ = NULL;
-#line 736 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = document_hint;
-#line 736 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (g_strcmp0 (_tmp6_, "photo") == 0) {
 #line 3448 "ui.c"
 			GtkRadioMenuItem* _tmp7_ = NULL;
 			GtkRadioMenuItem* _tmp8_ = NULL;
 			GtkRadioMenuItem* _tmp9_ = NULL;
-#line 738 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = self->priv->photo_button_menuitem;
-#line 738 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp7_, TRUE);
-#line 739 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp8_ = self->priv->photo_button_hb_menuitem;
-#line 739 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp8_, TRUE);
-#line 740 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = self->priv->photo_menuitem;
-#line 740 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp9_, TRUE);
 #line 3464 "ui.c"
 		}
 	}
-#line 743 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = save;
-#line 743 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp10_) {
 #line 3471 "ui.c"
 		GSettings* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
-#line 744 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = self->priv->settings;
-#line 744 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = document_hint;
-#line 744 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_settings_set_string (_tmp11_, "document-type", _tmp12_);
 #line 3480 "ui.c"
 	}
@@ -3485,19 +3485,19 @@ static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkChe
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 748 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 750 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 750 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 750 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 750 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 751 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "text", TRUE);
 #line 3503 "ui.c"
 	}
@@ -3505,7 +3505,7 @@ static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkChe
 
 
 static void _user_interface_text_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_text_menuitem_toggled_cb ((UserInterface*) self, _sender);
 #line 3511 "ui.c"
 }
@@ -3515,19 +3515,19 @@ static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCh
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 755 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 755 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 757 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 757 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 757 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 757 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 758 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "photo", TRUE);
 #line 3533 "ui.c"
 	}
@@ -3535,7 +3535,7 @@ static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCh
 
 
 static void _user_interface_photo_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_photo_menuitem_toggled_cb ((UserInterface*) self, _sender);
 #line 3541 "ui.c"
 }
@@ -3546,22 +3546,22 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 	GtkListStore* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 761 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 765 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_side_model;
-#line 765 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 765 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 765 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
 #line 3560 "ui.c"
 		{
 			gboolean _tmp3_ = FALSE;
-#line 767 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = TRUE;
-#line 767 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
 #line 3567 "ui.c"
 				gint s = 0;
@@ -3569,46 +3569,46 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 				GtkTreeIter _tmp7_ = {0};
 				gint _tmp8_ = 0;
 				ScanType _tmp9_ = 0;
-#line 767 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp3_) {
 #line 3575 "ui.c"
 					GtkListStore* _tmp4_ = NULL;
 					gboolean _tmp5_ = FALSE;
-#line 776 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp4_ = self->priv->page_side_model;
-#line 776 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp5_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp4_, &iter);
-#line 776 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (!_tmp5_) {
-#line 776 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
 #line 3586 "ui.c"
 					}
 				}
-#line 767 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 767 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp3_ = FALSE;
-#line 770 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp6_ = self->priv->page_side_model;
-#line 770 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = iter;
-#line 770 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_tree_model_get ((GtkTreeModel*) _tmp6_, &_tmp7_, 0, &s, -1, -1);
-#line 771 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = s;
-#line 771 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = page_side;
-#line 771 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp8_ == ((gint) _tmp9_)) {
 #line 3603 "ui.c"
 					GtkComboBox* _tmp10_ = NULL;
 					GtkTreeIter _tmp11_ = {0};
-#line 773 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp10_ = self->priv->page_side_combo;
-#line 773 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp11_ = iter;
-#line 773 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_combo_box_set_active_iter (_tmp10_, &_tmp11_);
-#line 774 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					return;
 #line 3614 "ui.c"
 				}
@@ -3623,7 +3623,7 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 	gboolean have_iter = FALSE;
 	gboolean _tmp14_ = FALSE;
 	gboolean _tmp18_ = FALSE;
-#line 780 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
 #line 3629 "ui.c"
 	{
@@ -3631,17 +3631,17 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 		GtkTreeIter _tmp1_ = {0};
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
-#line 785 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = self->priv->paper_size_model;
-#line 785 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 785 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp1_;
-#line 785 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_iter = _tmp2_;
-#line 785 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = TRUE;
-#line 785 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		while (TRUE) {
 #line 3647 "ui.c"
 			gboolean _tmp6_ = FALSE;
@@ -3652,94 +3652,94 @@ static void user_interface_set_paper_size (UserInterface* self, gint width, gint
 			gboolean _tmp9_ = FALSE;
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
-#line 785 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (!_tmp3_) {
 #line 3658 "ui.c"
 				GtkListStore* _tmp4_ = NULL;
 				gboolean _tmp5_ = FALSE;
-#line 787 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp4_ = self->priv->paper_size_model;
-#line 787 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp5_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp4_, &iter);
-#line 787 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				have_iter = _tmp5_;
 #line 3667 "ui.c"
 			}
-#line 785 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = FALSE;
-#line 786 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp6_ = have_iter;
-#line 786 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (!_tmp6_) {
-#line 786 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
 #line 3677 "ui.c"
 			}
-#line 790 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp7_ = self->priv->paper_size_model;
-#line 790 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp8_ = iter;
-#line 790 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_tree_model_get ((GtkTreeModel*) _tmp7_, &_tmp8_, 0, &w, 1, &h, -1, -1);
-#line 791 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = w;
-#line 791 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = width;
-#line 791 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp10_ == _tmp11_) {
 #line 3691 "ui.c"
 				gint _tmp12_ = 0;
 				gint _tmp13_ = 0;
-#line 791 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = h;
-#line 791 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp13_ = height;
-#line 791 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = _tmp12_ == _tmp13_;
 #line 3700 "ui.c"
 			} else {
-#line 791 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = FALSE;
 #line 3704 "ui.c"
 			}
-#line 791 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (_tmp9_) {
-#line 792 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
 #line 3710 "ui.c"
 			}
 		}
 	}
-#line 795 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = have_iter;
-#line 795 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp14_) {
 #line 3718 "ui.c"
 		GtkListStore* _tmp15_ = NULL;
 		GtkTreeIter _tmp16_ = {0};
 		gboolean _tmp17_ = FALSE;
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = self->priv->paper_size_model;
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp15_, &_tmp16_);
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp16_;
-#line 796 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_iter = _tmp17_;
 #line 3730 "ui.c"
 	}
-#line 797 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = have_iter;
-#line 797 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp18_) {
 #line 3736 "ui.c"
 		GtkComboBox* _tmp19_ = NULL;
 		GtkTreeIter _tmp20_ = {0};
-#line 798 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = self->priv->paper_size_combo;
-#line 798 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp20_ = iter;
-#line 798 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_combo_box_set_active_iter (_tmp19_, &_tmp20_);
 #line 3745 "ui.c"
 	}
@@ -3753,32 +3753,32 @@ static gint user_interface_get_text_dpi (UserInterface* self) {
 	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 801 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 804 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 806 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->text_dpi_combo;
-#line 806 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 806 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 806 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
 #line 3769 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 807 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->text_dpi_model;
-#line 807 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 807 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
 #line 3778 "ui.c"
 	}
-#line 809 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
-#line 809 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 3784 "ui.c"
 }
@@ -3791,32 +3791,32 @@ static gint user_interface_get_photo_dpi (UserInterface* self) {
 	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 812 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 815 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 817 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->photo_dpi_combo;
-#line 817 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 817 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 817 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
 #line 3807 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 818 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->photo_dpi_model;
-#line 818 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 818 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
 #line 3816 "ui.c"
 	}
-#line 820 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
-#line 820 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 3822 "ui.c"
 }
@@ -3830,34 +3830,34 @@ static ScanType user_interface_get_page_side (UserInterface* self) {
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
 	gint _tmp5_ = 0;
-#line 823 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 826 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_side = (gint) SCAN_TYPE_ADF_BOTH;
-#line 828 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_side_combo;
-#line 828 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 828 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 828 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
 #line 3846 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 829 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->page_side_model;
-#line 829 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 829 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &page_side, -1, -1);
 #line 3855 "ui.c"
 	}
-#line 831 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page_side;
-#line 831 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = (ScanType) _tmp5_;
-#line 831 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 3863 "ui.c"
 }
@@ -3872,64 +3872,64 @@ static gboolean user_interface_get_paper_size (UserInterface* self, gint* width,
 	GtkComboBox* _tmp1_ = NULL;
 	GtkTreeIter _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 834 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 838 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_height = 0;
-#line 838 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _vala_height;
-#line 838 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_width = _tmp0_;
-#line 839 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->paper_size_combo;
-#line 839 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = gtk_combo_box_get_active_iter (_tmp1_, &_tmp2_);
-#line 839 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp2_;
-#line 839 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
 #line 3892 "ui.c"
 		GtkListStore* _tmp4_ = NULL;
 		GtkTreeIter _tmp5_ = {0};
-#line 841 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->paper_size_model;
-#line 841 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = iter;
-#line 841 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp4_, &_tmp5_, 0, &_vala_width, 1, &_vala_height, -1, -1);
-#line 842 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 842 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (width) {
-#line 842 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*width = _vala_width;
 #line 3907 "ui.c"
 		}
-#line 842 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (height) {
-#line 842 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*height = _vala_height;
 #line 3913 "ui.c"
 		}
-#line 842 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
 #line 3917 "ui.c"
 	}
-#line 845 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 845 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (width) {
-#line 845 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*width = _vala_width;
 #line 3925 "ui.c"
 	}
-#line 845 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (height) {
-#line 845 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*height = _vala_height;
 #line 3931 "ui.c"
 	}
-#line 845 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 3935 "ui.c"
 }
@@ -3950,34 +3950,34 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) {
 	ScanOptions* _tmp17_ = NULL;
 	gint _tmp18_ = 0;
 	gint _tmp19_ = 0;
-#line 848 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 850 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = scan_options_new ();
-#line 850 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options = _tmp0_;
-#line 851 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->document_hint;
-#line 851 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp1_, "text") == 0) {
 #line 3964 "ui.c"
 		ScanOptions* _tmp2_ = NULL;
 		ScanOptions* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 		ScanOptions* _tmp5_ = NULL;
-#line 853 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = options;
-#line 853 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_->scan_mode = SCAN_MODE_GRAY;
-#line 854 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = options;
-#line 854 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = user_interface_get_text_dpi (self);
-#line 854 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_->dpi = _tmp4_;
-#line 855 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = options;
-#line 855 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_->depth = 2;
 #line 3983 "ui.c"
 	} else {
@@ -3985,51 +3985,51 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) {
 		ScanOptions* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
 		ScanOptions* _tmp9_ = NULL;
-#line 859 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = options;
-#line 859 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_->scan_mode = SCAN_MODE_COLOR;
-#line 860 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = options;
-#line 860 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = user_interface_get_photo_dpi (self);
-#line 860 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_->dpi = _tmp8_;
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = options;
-#line 861 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_->depth = 8;
 #line 4003 "ui.c"
 	}
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = options;
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = options;
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_get_paper_size (self, &_tmp12_, &_tmp13_);
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_->paper_width = _tmp12_;
-#line 863 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_->paper_height = _tmp13_;
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = options;
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = user_interface_get_brightness (self);
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = _tmp15_;
-#line 864 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_->brightness = _tmp16_;
-#line 865 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = options;
-#line 865 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = user_interface_get_contrast (self);
-#line 865 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = _tmp18_;
-#line 865 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_->contrast = _tmp19_;
-#line 867 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = options;
-#line 867 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 4035 "ui.c"
 }
@@ -4041,52 +4041,52 @@ static void user_interface_scan_button_clicked_cb (UserInterface* self, GtkWidge
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 871 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 871 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 873 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_make_scan_options (self);
-#line 873 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options = _tmp0_;
-#line 874 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options->type = SCAN_TYPE_SINGLE;
-#line 875 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_selected_device (self);
-#line 875 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 875 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 875 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "start-scan", _tmp3_, options);
-#line 875 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp3_);
-#line 871 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_options_unref0 (options);
 #line 4067 "ui.c"
 }
 
 
 static void _user_interface_scan_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_scan_button_clicked_cb ((UserInterface*) self, _sender);
 #line 4074 "ui.c"
 }
 
 
 static void user_interface_stop_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 879 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 879 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 881 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "stop-scan");
 #line 4085 "ui.c"
 }
 
 
 static void _user_interface_stop_scan_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_stop_scan_button_clicked_cb ((UserInterface*) self, _sender);
 #line 4092 "ui.c"
 }
@@ -4095,17 +4095,17 @@ static void _user_interface_stop_scan_button_clicked_cb_gtk_button_clicked (GtkB
 static void user_interface_continuous_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 885 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 885 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 887 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_get_scanning (self);
-#line 887 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_;
-#line 887 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
-#line 888 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
 #line 4111 "ui.c"
 	} else {
@@ -4117,29 +4117,29 @@ static void user_interface_continuous_scan_button_clicked_cb (UserInterface* sel
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		ScanOptions* _tmp8_ = NULL;
-#line 891 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = user_interface_make_scan_options (self);
-#line 891 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		options = _tmp2_;
-#line 892 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = options;
-#line 892 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = user_interface_get_page_side (self);
-#line 892 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_->type = _tmp4_;
-#line 893 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_selected_device (self);
-#line 893 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 893 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 893 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = options;
-#line 893 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "start-scan", _tmp7_, _tmp8_);
-#line 893 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp7_);
-#line 887 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_scan_options_unref0 (options);
 #line 4145 "ui.c"
 	}
@@ -4147,7 +4147,7 @@ static void user_interface_continuous_scan_button_clicked_cb (UserInterface* sel
 
 
 static void _user_interface_continuous_scan_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_continuous_scan_button_clicked_cb ((UserInterface*) self, _sender);
 #line 4153 "ui.c"
 }
@@ -4155,20 +4155,20 @@ static void _user_interface_continuous_scan_button_clicked_cb_gtk_menu_item_acti
 
 static void user_interface_preferences_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
 	GtkDialog* _tmp0_ = NULL;
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 898 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 900 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
 #line 4167 "ui.c"
 }
 
 
 static void _user_interface_preferences_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_preferences_button_clicked_cb ((UserInterface*) self, _sender);
 #line 4174 "ui.c"
 }
@@ -4176,11 +4176,11 @@ static void _user_interface_preferences_button_clicked_cb_gtk_menu_item_activate
 
 void user_interface_preferences_activate_cb (UserInterface* self) {
 	GtkDialog* _tmp0_ = NULL;
-#line 903 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 903 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 905 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 905 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
 #line 4186 "ui.c"
 }
@@ -4188,15 +4188,15 @@ void user_interface_preferences_activate_cb (UserInterface* self) {
 
 static gboolean user_interface_preferences_dialog_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event) {
 	gboolean result = FALSE;
-#line 909 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 909 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 909 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 911 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 4202 "ui.c"
 }
@@ -4205,7 +4205,7 @@ static gboolean user_interface_preferences_dialog_delete_event_cb (UserInterface
 static gboolean _user_interface_preferences_dialog_delete_event_cb_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = user_interface_preferences_dialog_delete_event_cb ((UserInterface*) self, _sender, event);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 4211 "ui.c"
 }
@@ -4213,27 +4213,27 @@ static gboolean _user_interface_preferences_dialog_delete_event_cb_gtk_widget_de
 
 static void user_interface_preferences_dialog_response_cb (UserInterface* self, GtkWidget* widget, gint response_id) {
 	GtkDialog* _tmp0_ = NULL;
-#line 915 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 915 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 917 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 917 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
 #line 4225 "ui.c"
 }
 
 
 static void _user_interface_preferences_dialog_response_cb_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_preferences_dialog_response_cb ((UserInterface*) self, _sender, response_id);
 #line 4232 "ui.c"
 }
 
 
 static gpointer _page_ref0 (gpointer self) {
-#line 922 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? page_ref (self) : NULL;
 #line 4239 "ui.c"
 }
@@ -4246,32 +4246,32 @@ static void user_interface_update_page_menu (UserInterface* self) {
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 920 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 922 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 922 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 922 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 922 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 922 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 923 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 923 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ == NULL) {
 #line 4266 "ui.c"
 		GtkMenuItem* _tmp5_ = NULL;
 		GtkMenuItem* _tmp6_ = NULL;
-#line 925 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->page_move_left_menuitem;
-#line 925 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp5_, FALSE);
-#line 926 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = self->priv->page_move_right_menuitem;
-#line 926 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp6_, FALSE);
 #line 4277 "ui.c"
 	} else {
@@ -4286,35 +4286,35 @@ static void user_interface_update_page_menu (UserInterface* self) {
 		Book* _tmp14_ = NULL;
 		guint _tmp15_ = 0U;
 		guint _tmp16_ = 0U;
-#line 930 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = self->priv->_book;
-#line 930 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = page;
-#line 930 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = book_get_page_index (_tmp7_, _tmp8_);
-#line 930 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		index = _tmp9_;
-#line 931 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = self->priv->page_move_left_menuitem;
-#line 931 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = index;
-#line 931 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp10_, _tmp11_ > ((guint) 0));
-#line 932 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = self->priv->page_move_right_menuitem;
-#line 932 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = index;
-#line 932 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = self->priv->_book;
-#line 932 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = book_get_n_pages (_tmp14_);
-#line 932 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = _tmp15_;
-#line 932 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp12_, _tmp13_ < (_tmp16_ - 1));
 #line 4316 "ui.c"
 	}
-#line 920 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
 #line 4320 "ui.c"
 }
@@ -4337,35 +4337,35 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 	Page* _tmp37_ = NULL;
 	gboolean _tmp38_ = FALSE;
 	gboolean _tmp39_ = FALSE;
-#line 936 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 936 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 938 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 938 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_ == NULL) {
-#line 939 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 4351 "ui.c"
 	}
-#line 941 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 941 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = TRUE;
-#line 943 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 943 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 945 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->no_crop_menuitem;
-#line 945 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 945 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	menuitem = _tmp2_;
-#line 946 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page;
-#line 946 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_get_has_crop (_tmp3_);
-#line 946 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 946 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_) {
 #line 4371 "ui.c"
 		gchar* crop_name = NULL;
@@ -4374,126 +4374,126 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = page_get_crop_name (_tmp6_);
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_;
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = g_strdup (_tmp8_);
-#line 948 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		crop_name = _tmp9_;
-#line 949 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = crop_name;
-#line 949 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp10_ != NULL) {
 #line 4392 "ui.c"
 			const gchar* _tmp11_ = NULL;
-#line 951 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = crop_name;
-#line 951 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 951 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			if (g_strcmp0 (_tmp11_, "A4") == 0) {
 #line 4398 "ui.c"
 				GtkRadioMenuItem* _tmp12_ = NULL;
 				GtkRadioMenuItem* _tmp13_ = NULL;
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = self->priv->a4_menuitem;
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (menuitem);
-#line 952 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				menuitem = _tmp13_;
 #line 4409 "ui.c"
 			} else {
 				const gchar* _tmp14_ = NULL;
-#line 953 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = crop_name;
-#line 953 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp14_, "A5") == 0) {
 #line 4416 "ui.c"
 					GtkRadioMenuItem* _tmp15_ = NULL;
 					GtkRadioMenuItem* _tmp16_ = NULL;
-#line 954 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp15_ = self->priv->a5_menuitem;
-#line 954 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 954 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (menuitem);
-#line 954 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					menuitem = _tmp16_;
 #line 4427 "ui.c"
 				} else {
 					const gchar* _tmp17_ = NULL;
-#line 955 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp17_ = crop_name;
-#line 955 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (g_strcmp0 (_tmp17_, "A6") == 0) {
 #line 4434 "ui.c"
 						GtkRadioMenuItem* _tmp18_ = NULL;
 						GtkRadioMenuItem* _tmp19_ = NULL;
-#line 956 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp18_ = self->priv->a6_menuitem;
-#line 956 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 956 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_g_object_unref0 (menuitem);
-#line 956 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						menuitem = _tmp19_;
 #line 4445 "ui.c"
 					} else {
 						const gchar* _tmp20_ = NULL;
-#line 957 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp20_ = crop_name;
-#line 957 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						if (g_strcmp0 (_tmp20_, "letter") == 0) {
 #line 4452 "ui.c"
 							GtkRadioMenuItem* _tmp21_ = NULL;
 							GtkRadioMenuItem* _tmp22_ = NULL;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp21_ = self->priv->letter_menuitem;
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp22_ = _g_object_ref0 (_tmp21_);
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_object_unref0 (menuitem);
-#line 958 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							menuitem = _tmp22_;
 #line 4463 "ui.c"
 						} else {
 							const gchar* _tmp23_ = NULL;
-#line 959 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp23_ = crop_name;
-#line 959 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (g_strcmp0 (_tmp23_, "legal") == 0) {
 #line 4470 "ui.c"
 								GtkRadioMenuItem* _tmp24_ = NULL;
 								GtkRadioMenuItem* _tmp25_ = NULL;
-#line 960 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp24_ = self->priv->legal_menuitem;
-#line 960 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp25_ = _g_object_ref0 (_tmp24_);
-#line 960 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_g_object_unref0 (menuitem);
-#line 960 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								menuitem = _tmp25_;
 #line 4481 "ui.c"
 							} else {
 								const gchar* _tmp26_ = NULL;
-#line 961 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp26_ = crop_name;
-#line 961 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								if (g_strcmp0 (_tmp26_, "4x6") == 0) {
 #line 4488 "ui.c"
 									GtkRadioMenuItem* _tmp27_ = NULL;
 									GtkRadioMenuItem* _tmp28_ = NULL;
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									_tmp27_ = self->priv->four_by_six_menuitem;
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									_g_object_unref0 (menuitem);
-#line 962 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									menuitem = _tmp28_;
 #line 4499 "ui.c"
 								}
@@ -4505,47 +4505,47 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 		} else {
 			GtkRadioMenuItem* _tmp29_ = NULL;
 			GtkRadioMenuItem* _tmp30_ = NULL;
-#line 965 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp29_ = self->priv->custom_crop_menuitem;
-#line 965 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp30_ = _g_object_ref0 (_tmp29_);
-#line 965 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (menuitem);
-#line 965 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			menuitem = _tmp30_;
 #line 4517 "ui.c"
 		}
-#line 946 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (crop_name);
 #line 4521 "ui.c"
 	}
-#line 968 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = menuitem;
-#line 968 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp31_, TRUE);
-#line 969 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = self->priv->crop_button;
-#line 969 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = page;
-#line 969 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp34_ = page_get_has_crop (_tmp33_);
-#line 969 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = _tmp34_;
-#line 969 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_toggle_button_set_active (_tmp32_, _tmp35_);
-#line 970 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp36_ = self->priv->crop_toolbutton;
-#line 970 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp37_ = page;
-#line 970 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp38_ = page_get_has_crop (_tmp37_);
-#line 970 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp39_ = _tmp38_;
-#line 970 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_toggle_tool_button_set_active (_tmp36_, _tmp39_);
-#line 972 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = FALSE;
-#line 936 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (menuitem);
 #line 4551 "ui.c"
 }
@@ -4559,31 +4559,31 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 	const gchar* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 975 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 975 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 975 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 977 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = get_temporary_filename ("scanned-page", "tiff");
-#line 977 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	path = _tmp0_;
-#line 978 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = path;
-#line 978 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_ == NULL) {
-#line 979 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 979 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 4581 "ui.c"
 	}
-#line 980 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = path;
-#line 980 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_file_new_for_path (_tmp2_);
-#line 980 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file = _tmp3_;
 #line 4589 "ui.c"
 	{
@@ -4591,17 +4591,17 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		GFile* _tmp7_ = NULL;
-#line 984 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = page;
-#line 984 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_quality (self);
-#line 984 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 984 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = file;
-#line 984 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_save (_tmp4_, "tiff", _tmp6_, _tmp7_, &_inner_error_);
-#line 984 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4607 "ui.c"
 			goto __catch17_g_error;
@@ -4614,40 +4614,40 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		const gchar* _tmp8_ = NULL;
 		GError* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
-#line 982 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 982 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 988 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _ ("Unable to save image for preview");
-#line 988 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = e;
-#line 988 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = _tmp9_->message;
-#line 988 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp8_, _tmp10_);
-#line 991 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 991 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 991 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 991 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 4638 "ui.c"
 	}
 	__finally17:
-#line 982 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 982 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 982 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 982 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.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 982 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 982 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 4653 "ui.c"
 	}
@@ -4658,23 +4658,23 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
 		guint32 _tmp16_ = 0U;
-#line 996 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = gtk_window_get_screen ((GtkWindow*) self);
-#line 996 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = _tmp11_;
-#line 996 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = file;
-#line 996 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = g_file_get_uri (_tmp13_);
-#line 996 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = _tmp14_;
-#line 996 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = gtk_get_current_event_time ();
-#line 996 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_show_uri (_tmp12_, _tmp15_, _tmp16_, &_inner_error_);
-#line 996 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp15_);
-#line 996 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 996 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4680 "ui.c"
 			goto __catch18_g_error;
@@ -4687,40 +4687,40 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		const gchar* _tmp17_ = NULL;
 		GError* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
-#line 994 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 994 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1000 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = _ ("Unable to open image preview application");
-#line 1000 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp18_ = e;
-#line 1000 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = _tmp18_->message;
-#line 1000 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp17_, _tmp19_);
-#line 994 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
 #line 4705 "ui.c"
 	}
 	__finally18:
-#line 994 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 994 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 994 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 994 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.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 994 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 994 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 4720 "ui.c"
 	}
-#line 975 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file);
-#line 975 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (path);
 #line 4726 "ui.c"
 }
@@ -4729,15 +4729,15 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 static void user_interface_show_page_menu_cb (UserInterface* self, BookView* view) {
 	GtkMenu* _tmp0_ = NULL;
 	guint32 _tmp1_ = 0U;
-#line 1006 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1006 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 1008 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_menu;
-#line 1008 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_get_current_event_time ();
-#line 1008 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, (guint) 3, _tmp1_);
 #line 4743 "ui.c"
 }
@@ -4751,48 +4751,48 @@ static void user_interface_rotate_left_button_clicked_cb (UserInterface* self, G
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1012 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1012 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1014 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1014 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1015 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 4765 "ui.c"
 	}
-#line 1016 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
-#line 1016 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_view_get_selected_page (_tmp1_);
-#line 1016 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1016 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _page_ref0 (_tmp3_);
-#line 1016 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp4_;
-#line 1017 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1017 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ != NULL) {
 #line 4781 "ui.c"
 		Page* _tmp6_ = NULL;
-#line 1018 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
-#line 1018 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_rotate_left (_tmp6_);
 #line 4787 "ui.c"
 	}
-#line 1012 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
 #line 4791 "ui.c"
 }
 
 
 static void _user_interface_rotate_left_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_rotate_left_button_clicked_cb ((UserInterface*) self, _sender);
 #line 4798 "ui.c"
 }
@@ -4806,48 +4806,48 @@ static void user_interface_rotate_right_button_clicked_cb (UserInterface* self,
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1022 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1022 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1024 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1024 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1024 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1025 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 4820 "ui.c"
 	}
-#line 1026 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
-#line 1026 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_view_get_selected_page (_tmp1_);
-#line 1026 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1026 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _page_ref0 (_tmp3_);
-#line 1026 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp4_;
-#line 1027 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1027 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ != NULL) {
 #line 4836 "ui.c"
 		Page* _tmp6_ = NULL;
-#line 1028 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
-#line 1028 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_rotate_right (_tmp6_);
 #line 4842 "ui.c"
 	}
-#line 1022 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
 #line 4846 "ui.c"
 }
 
 
 static void _user_interface_rotate_right_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_rotate_right_button_clicked_cb ((UserInterface*) self, _sender);
 #line 4853 "ui.c"
 }
@@ -4864,60 +4864,60 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 	Page* _tmp6_ = NULL;
 	Page* _tmp7_ = NULL;
 	const gchar* _tmp8_ = NULL;
-#line 1031 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1033 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->crop_rotate_menuitem;
-#line 1033 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = crop_name;
-#line 1033 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp1_ != NULL);
-#line 1035 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->updating_page_menu;
-#line 1035 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1036 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 4882 "ui.c"
 	}
-#line 1038 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
-#line 1038 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book_view_get_selected_page (_tmp3_);
-#line 1038 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1038 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _page_ref0 (_tmp5_);
-#line 1038 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp6_;
-#line 1039 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = page;
-#line 1039 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ == NULL) {
-#line 1041 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_warning ("ui.vala:1041: Trying to set crop but no selected page");
-#line 1042 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (page);
-#line 1042 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 4904 "ui.c"
 	}
-#line 1045 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = crop_name;
-#line 1045 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1045 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp8_ == NULL) {
 #line 4910 "ui.c"
 		Page* _tmp9_ = NULL;
-#line 1046 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = page;
-#line 1046 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_set_no_crop (_tmp9_);
 #line 4916 "ui.c"
 	} else {
 		const gchar* _tmp10_ = NULL;
-#line 1047 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = crop_name;
-#line 1047 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (g_strcmp0 (_tmp10_, "custom") == 0) {
 #line 4923 "ui.c"
 			gint width = 0;
@@ -4940,64 +4940,64 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 			gint _tmp24_ = 0;
 			gint _tmp25_ = 0;
 			gint _tmp26_ = 0;
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = page;
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp12_ = page_get_width (_tmp11_);
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp13_ = _tmp12_;
-#line 1049 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			width = _tmp13_;
-#line 1050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp14_ = page;
-#line 1050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp15_ = page_get_height (_tmp14_);
-#line 1050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp16_ = _tmp15_;
-#line 1050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			height = _tmp16_;
-#line 1051 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp17_ = width;
-#line 1051 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			crop_width = (gint) ((_tmp17_ * 0.8) + 0.5);
-#line 1052 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp18_ = height;
-#line 1052 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			crop_height = (gint) ((_tmp18_ * 0.8) + 0.5);
-#line 1053 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp19_ = page;
-#line 1053 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp20_ = crop_width;
-#line 1053 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp21_ = crop_height;
-#line 1053 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_set_custom_crop (_tmp19_, _tmp20_, _tmp21_);
-#line 1054 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp22_ = page;
-#line 1054 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp23_ = width;
-#line 1054 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp24_ = crop_width;
-#line 1054 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp25_ = height;
-#line 1054 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp26_ = crop_height;
-#line 1054 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_move_crop (_tmp22_, (_tmp23_ - _tmp24_) / 2, (_tmp25_ - _tmp26_) / 2);
 #line 4988 "ui.c"
 		} else {
 			Page* _tmp27_ = NULL;
 			const gchar* _tmp28_ = NULL;
-#line 1057 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp27_ = page;
-#line 1057 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp28_ = crop_name;
-#line 1057 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_set_named_crop (_tmp27_, _tmp28_);
 #line 4998 "ui.c"
 		}
 	}
-#line 1031 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1031 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
 #line 5003 "ui.c"
 }
@@ -5007,19 +5007,19 @@ static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, Gtk
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1061 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1061 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1063 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1063 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1063 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1063 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1064 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, NULL);
 #line 5025 "ui.c"
 	}
@@ -5027,7 +5027,7 @@ static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, Gtk
 
 
 static void _user_interface_no_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_no_crop_menuitem_toggled_cb ((UserInterface*) self, _sender);
 #line 5033 "ui.c"
 }
@@ -5037,19 +5037,19 @@ static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self,
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1068 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1068 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1070 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1070 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1070 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1070 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1071 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "custom");
 #line 5055 "ui.c"
 	}
@@ -5057,7 +5057,7 @@ static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self,
 
 
 static void _user_interface_custom_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_custom_crop_menuitem_toggled_cb ((UserInterface*) self, _sender);
 #line 5063 "ui.c"
 }
@@ -5068,38 +5068,38 @@ static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggl
 	GtkToggleButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 1075 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1075 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1077 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1077 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1078 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 5082 "ui.c"
 	}
-#line 1080 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = widget;
-#line 1080 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_toggle_button_get_active (_tmp1_);
-#line 1080 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1080 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
 #line 5092 "ui.c"
 		GtkRadioMenuItem* _tmp4_ = NULL;
-#line 1081 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->custom_crop_menuitem;
-#line 1081 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
 #line 5098 "ui.c"
 	} else {
 		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 1083 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->no_crop_menuitem;
-#line 1083 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
 #line 5105 "ui.c"
 	}
@@ -5107,7 +5107,7 @@ static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggl
 
 
 static void _user_interface_crop_button_toggled_cb_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_crop_button_toggled_cb ((UserInterface*) self, _sender);
 #line 5113 "ui.c"
 }
@@ -5118,38 +5118,38 @@ static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkT
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1087 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1089 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1089 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1090 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 5132 "ui.c"
 	}
-#line 1092 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = widget;
-#line 1092 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 1092 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1092 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
 #line 5142 "ui.c"
 		GtkRadioMenuItem* _tmp4_ = NULL;
-#line 1093 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->custom_crop_menuitem;
-#line 1093 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
 #line 5148 "ui.c"
 	} else {
 		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->no_crop_menuitem;
-#line 1095 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
 #line 5155 "ui.c"
 	}
@@ -5157,7 +5157,7 @@ static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkT
 
 
 static void _user_interface_crop_toolbutton_toggled_cb_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_crop_toolbutton_toggled_cb ((UserInterface*) self, _sender);
 #line 5163 "ui.c"
 }
@@ -5167,19 +5167,19 @@ static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self,
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1099 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1099 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1099 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1101 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1101 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1101 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1101 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1102 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "4x6");
 #line 5185 "ui.c"
 	}
@@ -5187,7 +5187,7 @@ static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self,
 
 
 static void _user_interface_four_by_six_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_four_by_six_menuitem_toggled_cb ((UserInterface*) self, _sender);
 #line 5193 "ui.c"
 }
@@ -5197,19 +5197,19 @@ static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCh
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1106 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1106 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1108 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1108 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1108 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1108 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1109 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "legal");
 #line 5215 "ui.c"
 	}
@@ -5217,7 +5217,7 @@ static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCh
 
 
 static void _user_interface_legal_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_legal_menuitem_toggled_cb ((UserInterface*) self, _sender);
 #line 5223 "ui.c"
 }
@@ -5227,19 +5227,19 @@ static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkC
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1113 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1113 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1115 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1115 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1115 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1115 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1116 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "letter");
 #line 5245 "ui.c"
 	}
@@ -5247,7 +5247,7 @@ static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkC
 
 
 static void _user_interface_letter_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_letter_menuitem_toggled_cb ((UserInterface*) self, _sender);
 #line 5253 "ui.c"
 }
@@ -5257,19 +5257,19 @@ static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1120 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1120 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1120 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1120 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1122 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1122 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1122 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1122 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1123 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A6");
 #line 5275 "ui.c"
 	}
@@ -5277,7 +5277,7 @@ static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheck
 
 
 static void _user_interface_a6_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_a6_menuitem_toggled_cb ((UserInterface*) self, _sender);
 #line 5283 "ui.c"
 }
@@ -5287,19 +5287,19 @@ static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1127 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1127 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1129 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1129 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1129 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1129 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1130 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A5");
 #line 5305 "ui.c"
 	}
@@ -5307,7 +5307,7 @@ static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheck
 
 
 static void _user_interface_a5_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_a5_menuitem_toggled_cb ((UserInterface*) self, _sender);
 #line 5313 "ui.c"
 }
@@ -5317,19 +5317,19 @@ static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheck
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1134 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1134 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1136 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1136 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1136 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1136 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 1137 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A4");
 #line 5335 "ui.c"
 	}
@@ -5337,7 +5337,7 @@ static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheck
 
 
 static void _user_interface_a4_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_a4_menuitem_toggled_cb ((UserInterface*) self, _sender);
 #line 5343 "ui.c"
 }
@@ -5351,42 +5351,42 @@ static void user_interface_crop_rotate_menuitem_activate_cb (UserInterface* self
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1141 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1141 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1143 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1143 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1143 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1143 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1143 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1143 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1144 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1144 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ == NULL) {
-#line 1145 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (page);
-#line 1145 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 5377 "ui.c"
 	}
-#line 1146 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1146 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_rotate_crop (_tmp5_);
-#line 1141 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
 #line 5385 "ui.c"
 }
 
 
 static void _user_interface_crop_rotate_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_crop_rotate_menuitem_activate_cb ((UserInterface*) self, _sender);
 #line 5392 "ui.c"
 }
@@ -5403,54 +5403,54 @@ static void user_interface_page_move_left_menuitem_activate_cb (UserInterface* s
 	Page* _tmp5_ = NULL;
 	guint _tmp6_ = 0U;
 	guint _tmp7_ = 0U;
-#line 1150 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1150 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1152 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1152 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1152 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1152 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1152 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1153 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->_book;
-#line 1153 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1153 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_page_index (_tmp4_, _tmp5_);
-#line 1153 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = _tmp6_;
-#line 1154 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = index;
-#line 1154 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ > ((guint) 0)) {
 #line 5433 "ui.c"
 		Book* _tmp8_ = NULL;
 		Page* _tmp9_ = NULL;
 		guint _tmp10_ = 0U;
-#line 1155 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = self->priv->_book;
-#line 1155 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = page;
-#line 1155 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = index;
-#line 1155 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_move_page (_tmp8_, _tmp9_, _tmp10_ - 1);
 #line 5445 "ui.c"
 	}
-#line 1150 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
 #line 5449 "ui.c"
 }
 
 
 static void _user_interface_page_move_left_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_move_left_menuitem_activate_cb ((UserInterface*) self, _sender);
 #line 5456 "ui.c"
 }
@@ -5470,37 +5470,37 @@ static void user_interface_page_move_right_menuitem_activate_cb (UserInterface*
 	Book* _tmp8_ = NULL;
 	guint _tmp9_ = 0U;
 	guint _tmp10_ = 0U;
-#line 1159 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1159 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1161 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1161 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1161 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1161 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1161 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1162 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->_book;
-#line 1162 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1162 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_page_index (_tmp4_, _tmp5_);
-#line 1162 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = _tmp6_;
-#line 1163 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = index;
-#line 1163 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->_book;
-#line 1163 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = book_get_n_pages (_tmp8_);
-#line 1163 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = _tmp9_;
-#line 1163 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ < (_tmp10_ - 1)) {
 #line 5506 "ui.c"
 		Book* _tmp11_ = NULL;
@@ -5508,28 +5508,28 @@ static void user_interface_page_move_right_menuitem_activate_cb (UserInterface*
 		Book* _tmp13_ = NULL;
 		Page* _tmp14_ = NULL;
 		guint _tmp15_ = 0U;
-#line 1164 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = self->priv->_book;
-#line 1164 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = page;
-#line 1164 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = self->priv->_book;
-#line 1164 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = page;
-#line 1164 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = book_get_page_index (_tmp13_, _tmp14_);
-#line 1164 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_move_page (_tmp11_, _tmp12_, _tmp15_ + 1);
 #line 5524 "ui.c"
 	}
-#line 1159 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
 #line 5528 "ui.c"
 }
 
 
 static void _user_interface_page_move_right_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_move_right_menuitem_activate_cb ((UserInterface*) self, _sender);
 #line 5535 "ui.c"
 }
@@ -5542,39 +5542,39 @@ static void user_interface_page_delete_menuitem_activate_cb (UserInterface* self
 	BookView* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1168 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1168 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1170 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1170 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_book (_tmp0_);
-#line 1170 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1170 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
-#line 1170 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book_view_get_selected_page (_tmp3_);
-#line 1170 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1170 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_delete_page (_tmp2_, _tmp5_);
 #line 5564 "ui.c"
 }
 
 
 static void _user_interface_page_delete_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_delete_menuitem_activate_cb ((UserInterface*) self, _sender);
 #line 5571 "ui.c"
 }
 
 
 static Block1Data* block1_data_ref (Block1Data* _data1_) {
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_atomic_int_inc (&_data1_->_ref_count_);
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return _data1_;
 #line 5580 "ui.c"
 }
@@ -5583,17 +5583,17 @@ static Block1Data* block1_data_ref (Block1Data* _data1_) {
 static void block1_data_unref (void * _userdata_) {
 	Block1Data* _data1_;
 	_data1_ = (Block1Data*) _userdata_;
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
 #line 5589 "ui.c"
 		UserInterface* self;
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self = _data1_->self;
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (_data1_->dialog);
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (self);
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_slice_free (Block1Data, _data1_);
 #line 5599 "ui.c"
 	}
@@ -5606,44 +5606,44 @@ static gboolean __lambda5_ (Block1Data* _data1_, GdkEventKey* e) {
 	gboolean _tmp0_ = FALSE;
 	GdkEventKey* _tmp1_ = NULL;
 	GdkModifierType _tmp2_ = 0;
-#line 1182 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data1_->self;
-#line 1182 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (e != NULL, FALSE);
-#line 1184 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = e;
-#line 1184 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_->state;
-#line 1184 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_ == 0) {
 #line 5620 "ui.c"
 		GdkEventKey* _tmp3_ = NULL;
 		guint _tmp4_ = 0U;
-#line 1184 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = e;
-#line 1184 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _tmp3_->keyval;
-#line 1184 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_ == ((guint) GDK_KEY_Escape);
 #line 5629 "ui.c"
 	} else {
-#line 1184 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = FALSE;
 #line 5633 "ui.c"
 	}
-#line 1184 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1186 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
-#line 1187 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 1187 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
 #line 5643 "ui.c"
 	}
-#line 1190 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1190 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1190 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 5649 "ui.c"
 }
@@ -5652,7 +5652,7 @@ static gboolean __lambda5_ (Block1Data* _data1_, GdkEventKey* e) {
 static gboolean ___lambda5__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
 	result = __lambda5_ (self, event);
-#line 1182 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 5658 "ui.c"
 }
@@ -5661,20 +5661,20 @@ static gboolean ___lambda5__gtk_widget_key_press_event (GtkWidget* _sender, GdkE
 static void __lambda6_ (Block1Data* _data1_) {
 	UserInterface* self;
 	Book* _tmp0_ = NULL;
-#line 1204 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data1_->self;
-#line 1206 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 1206 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1206 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_combine_sides (_tmp0_);
-#line 1207 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
 #line 5673 "ui.c"
 }
 
 
 static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1204 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda6_ (self);
 #line 5680 "ui.c"
 }
@@ -5683,20 +5683,20 @@ static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self) {
 static void __lambda7_ (Block1Data* _data1_) {
 	UserInterface* self;
 	Book* _tmp0_ = NULL;
-#line 1214 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data1_->self;
-#line 1216 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 1216 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1216 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_combine_sides_reverse (_tmp0_);
-#line 1217 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
 #line 5695 "ui.c"
 }
 
 
 static void ___lambda7__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1214 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda7_ (self);
 #line 5702 "ui.c"
 }
@@ -5705,20 +5705,20 @@ static void ___lambda7__gtk_button_clicked (GtkButton* _sender, gpointer self) {
 static void __lambda8_ (Block1Data* _data1_) {
 	UserInterface* self;
 	Book* _tmp0_ = NULL;
-#line 1224 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data1_->self;
-#line 1226 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 1226 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_reverse (_tmp0_);
-#line 1227 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
 #line 5717 "ui.c"
 }
 
 
 static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1224 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda8_ (self);
 #line 5724 "ui.c"
 }
@@ -5726,16 +5726,16 @@ static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self) {
 
 static void __lambda9_ (Block1Data* _data1_) {
 	UserInterface* self;
-#line 1234 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = _data1_->self;
-#line 1236 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1236 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
 #line 5734 "ui.c"
 }
 
 
 static void ___lambda9__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1234 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda9_ (self);
 #line 5741 "ui.c"
 }
@@ -5768,168 +5768,168 @@ static void user_interface_reorder_document (UserInterface* self) {
 	GtkButton* _tmp20_ = NULL;
 	GtkButton* _tmp21_ = NULL;
 	GtkButton* _tmp22_ = NULL;
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_ = g_slice_new0 (Block1Data);
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_->_ref_count_ = 1;
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_->self = g_object_ref (self);
-#line 1175 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkWindow*) gtk_window_new (GTK_WINDOW_TOPLEVEL);
-#line 1175 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1175 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_->dialog = _tmp0_;
-#line 1176 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_type_hint (_data1_->dialog, GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 1177 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_modal (_data1_->dialog, TRUE);
-#line 1178 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_set_border_width ((GtkContainer*) _data1_->dialog, (guint) 12);
-#line 1180 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Reorder Pages");
-#line 1180 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1180 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_title (_data1_->dialog, _tmp1_);
-#line 1181 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for (_data1_->dialog, (GtkWindow*) self);
-#line 1182 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_data ((GtkWidget*) _data1_->dialog, "key-press-event", (GCallback) ___lambda5__gtk_widget_key_press_event, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 1192 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _data1_->dialog, TRUE);
-#line 1194 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = (GtkGrid*) gtk_grid_new ();
-#line 1194 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp2_);
-#line 1194 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g = _tmp2_;
-#line 1195 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_set_row_homogeneous (g, TRUE);
-#line 1196 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_set_row_spacing (g, 6);
-#line 1197 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_set_column_homogeneous (g, TRUE);
-#line 1198 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_set_column_spacing (g, 6);
-#line 1199 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) g, TRUE);
-#line 1200 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) _data1_->dialog, (GtkWidget*) g);
-#line 1203 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _ ("Combine sides");
-#line 1203 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = user_interface_make_reorder_button (self, _tmp3_, "F1F2F3B1B2B3-F1B1F2B2F3B3");
-#line 1203 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp4_;
-#line 1204 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = b;
-#line 1204 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_data (_tmp5_, "clicked", (GCallback) ___lambda6__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 1209 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = b;
-#line 1209 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp6_, TRUE);
-#line 1210 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = b;
-#line 1210 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp7_, 0, 0, 1, 1);
-#line 1213 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("Combine sides (reverse)");
-#line 1213 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = user_interface_make_reorder_button (self, _tmp8_, "F1F2F3B3B2B1-F1B1F2B2F3B3");
-#line 1213 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1213 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp9_;
-#line 1214 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = b;
-#line 1214 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_data (_tmp10_, "clicked", (GCallback) ___lambda7__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 1219 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = b;
-#line 1219 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
-#line 1220 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = b;
-#line 1220 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp12_, 1, 0, 1, 1);
-#line 1223 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = _ ("Reverse");
-#line 1223 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = user_interface_make_reorder_button (self, _tmp13_, "C1C2C3C4C5C6-C6C5C4C3C2C1");
-#line 1223 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1223 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp14_;
-#line 1224 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = b;
-#line 1224 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_data (_tmp15_, "clicked", (GCallback) ___lambda8__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 1229 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = b;
-#line 1229 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp16_, TRUE);
-#line 1230 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = b;
-#line 1230 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp17_, 0, 2, 1, 1);
-#line 1233 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = _ ("Keep unchanged");
-#line 1233 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = user_interface_make_reorder_button (self, _tmp18_, "C1C2C3C4C5C6-C1C2C3C4C5C6");
-#line 1233 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1233 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1233 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp19_;
-#line 1234 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = b;
-#line 1234 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_data (_tmp20_, "clicked", (GCallback) ___lambda9__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 1238 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = b;
-#line 1238 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp21_, TRUE);
-#line 1239 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = b;
-#line 1239 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_grid_attach (g, (GtkWidget*) _tmp22_, 1, 2, 1, 1);
-#line 1241 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present (_data1_->dialog);
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (b);
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (g);
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	block1_data_unref (_data1_);
-#line 1173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_data1_ = NULL;
 #line 5908 "ui.c"
 }
 
 
 void user_interface_reorder_document_activate_cb (UserInterface* self) {
-#line 1244 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1246 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document (self);
 #line 5917 "ui.c"
 }
 
 
 static void user_interface_reorder_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1250 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1250 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1252 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_document (self);
 #line 5928 "ui.c"
 }
 
 
 static void _user_interface_reorder_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_reorder_menuitem_activate_cb ((UserInterface*) self, _sender);
 #line 5935 "ui.c"
 }
@@ -5947,59 +5947,59 @@ static GtkButton* user_interface_make_reorder_button (UserInterface* self, const
 	GtkBox* rb = NULL;
 	const gchar* _tmp4_ = NULL;
 	GtkBox* _tmp5_ = NULL;
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (text != NULL, NULL);
-#line 1255 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1255 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (items != NULL, NULL);
-#line 1257 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkButton*) gtk_button_new ();
-#line 1257 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1257 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	b = _tmp0_;
-#line 1259 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-#line 1259 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1259 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	vbox = _tmp1_;
-#line 1260 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) vbox, TRUE);
-#line 1261 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) b, (GtkWidget*) vbox);
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = text;
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = (GtkLabel*) gtk_label_new (_tmp2_);
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1263 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	label = _tmp3_;
-#line 1264 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) label, TRUE);
-#line 1265 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) label, TRUE, TRUE, (guint) 0);
-#line 1267 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = items;
-#line 1267 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = user_interface_make_reorder_box (self, _tmp4_);
-#line 1267 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	rb = _tmp5_;
-#line 1268 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) rb, TRUE);
-#line 1269 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) rb, TRUE, TRUE, (guint) 0);
-#line 1271 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = b;
-#line 1271 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (rb);
-#line 1271 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (label);
-#line 1271 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (vbox);
-#line 1271 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 6005 "ui.c"
 }
@@ -6029,33 +6029,33 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 	GtkBox* _tmp0_ = NULL;
 	GtkBox* _tmp1_ = NULL;
 	GtkBox* page_box = NULL;
-#line 1274 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1274 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (items != NULL, NULL);
-#line 1276 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-#line 1276 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1276 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	box = _tmp0_;
-#line 1277 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = box;
-#line 1277 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp1_, TRUE);
-#line 1279 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_box = NULL;
 #line 6049 "ui.c"
 	{
 		gint i = 0;
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		i = 0;
 #line 6054 "ui.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp2_ = TRUE;
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
 #line 6061 "ui.c"
 				const gchar* _tmp4_ = NULL;
@@ -6097,37 +6097,37 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 				PageIcon* _tmp49_ = NULL;
 				GtkBox* _tmp50_ = NULL;
 				PageIcon* _tmp51_ = NULL;
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!_tmp2_) {
 #line 6103 "ui.c"
 					gint _tmp3_ = 0;
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp3_ = i;
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					i = _tmp3_ + 1;
 #line 6109 "ui.c"
 				}
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp2_ = FALSE;
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp4_ = items;
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp5_ = i;
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp6_ = string_get (_tmp4_, (glong) _tmp5_);
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (!(_tmp6_ != '\0')) {
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
 #line 6123 "ui.c"
 				}
-#line 1282 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = items;
-#line 1282 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = i;
-#line 1282 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp9_ = string_get (_tmp7_, (glong) _tmp8_);
-#line 1282 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp9_ == '-') {
 #line 6133 "ui.c"
 					GtkArrow* a = NULL;
@@ -6135,124 +6135,124 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 					GtkArrow* _tmp11_ = NULL;
 					GtkBox* _tmp12_ = NULL;
 					GtkArrow* _tmp13_ = NULL;
-#line 1284 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp10_ = (GtkArrow*) gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
-#line 1284 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					g_object_ref_sink (_tmp10_);
-#line 1284 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					a = _tmp10_;
-#line 1285 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp11_ = a;
-#line 1285 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
-#line 1286 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp12_ = box;
-#line 1286 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp13_ = a;
-#line 1286 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_box_pack_start (_tmp12_, (GtkWidget*) _tmp13_, FALSE, FALSE, (guint) 0);
-#line 1287 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (page_box);
-#line 1287 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					page_box = NULL;
-#line 1288 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (a);
-#line 1288 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					continue;
 #line 6163 "ui.c"
 				}
-#line 1292 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp14_ = items;
-#line 1292 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp15_ = i;
-#line 1292 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp16_ = string_get (_tmp14_, (glong) _tmp15_);
-#line 1292 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				side = _tmp16_;
-#line 1293 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp17_ = i;
-#line 1293 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				i = _tmp17_ + 1;
-#line 1294 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp18_ = items;
-#line 1294 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp19_ = i;
-#line 1294 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp20_ = string_get (_tmp18_, (glong) _tmp19_);
-#line 1294 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp20_ == '\0') {
-#line 1295 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
 #line 6187 "ui.c"
 				}
-#line 1297 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = page_box;
-#line 1297 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp21_ == NULL) {
 #line 6193 "ui.c"
 					GtkBox* _tmp22_ = NULL;
 					GtkBox* _tmp23_ = NULL;
 					GtkBox* _tmp24_ = NULL;
 					GtkBox* _tmp25_ = NULL;
-#line 1299 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 1299 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					g_object_ref_sink (_tmp22_);
-#line 1299 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_object_unref0 (page_box);
-#line 1299 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1299 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					page_box = _tmp22_;
-#line 1300 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp23_ = page_box;
-#line 1300 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_widget_set_visible ((GtkWidget*) _tmp23_, TRUE);
-#line 1301 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp24_ = box;
-#line 1301 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp25_ = page_box;
-#line 1301 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_box_pack_start (_tmp24_, (GtkWidget*) _tmp25_, FALSE, FALSE, (guint) 0);
 #line 6216 "ui.c"
 				}
-#line 1305 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				r = 1.0;
-#line 1306 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				g = 1.0;
-#line 1307 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				b = 1.0;
-#line 1308 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp26_ = side;
-#line 1308 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				switch (_tmp26_) {
-#line 1308 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'F':
 #line 6230 "ui.c"
 					{
-#line 1312 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1312 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						r = 0x75 / 255.0;
-#line 1313 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						g = 0x50 / 255.0;
-#line 1314 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1314 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						b = 0x7B / 255.0;
-#line 1315 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
 #line 6240 "ui.c"
 					}
-#line 1308 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'B':
 #line 6244 "ui.c"
 					{
-#line 1318 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						r = 0xF5 / 255.0;
-#line 1319 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						g = 0x79 / 255.0;
-#line 1320 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						b = 0.0;
-#line 1321 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
 #line 6254 "ui.c"
 					}
-#line 1308 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					case 'C':
 #line 6258 "ui.c"
 					{
@@ -6263,127 +6263,127 @@ static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar
 						gdouble _tmp30_ = 0.0;
 						gdouble _tmp31_ = 0.0;
 						gdouble _tmp32_ = 0.0;
-#line 1324 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp27_ = items;
-#line 1324 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp28_ = i;
-#line 1324 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp29_ = string_get (_tmp27_, (glong) _tmp28_);
-#line 1324 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						p = (_tmp29_ - '1') / 5.0;
-#line 1325 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp30_ = p;
-#line 1325 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp31_ = p;
-#line 1325 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						r = ((0xED / 255.0) * (1 - _tmp30_)) + (0xCC * _tmp31_);
-#line 1326 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp32_ = p;
-#line 1326 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						g = (0xD4 / 255.0) * (1 - _tmp32_);
-#line 1327 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						b = (gdouble) 0;
-#line 1328 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
 #line 6289 "ui.c"
 					}
 					default:
-#line 1308 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					break;
 #line 6294 "ui.c"
 				}
-#line 1332 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp33_ = r;
-#line 1332 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp34_ = r;
-#line 1332 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				r = _tmp33_ + ((1.0 - _tmp34_) * 0.7);
-#line 1333 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp35_ = g;
-#line 1333 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp36_ = g;
-#line 1333 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				g = _tmp35_ + ((1.0 - _tmp36_) * 0.7);
-#line 1334 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp37_ = b;
-#line 1334 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp38_ = b;
-#line 1334 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				b = _tmp37_ + ((1.0 - _tmp38_) * 0.7);
-#line 1336 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp39_ = items;
-#line 1336 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp40_ = i;
-#line 1336 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp41_ = string_get (_tmp39_, (glong) _tmp40_);
-#line 1336 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp42_ = g_strdup_printf ("%c", (gint) _tmp41_);
-#line 1336 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp43_ = _tmp42_;
-#line 1336 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp44_ = r;
-#line 1336 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp45_ = g;
-#line 1336 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp46_ = b;
-#line 1336 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp47_ = page_icon_new (_tmp43_, _tmp44_, _tmp45_, _tmp46_);
-#line 1336 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				g_object_ref_sink (_tmp47_);
-#line 1336 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp48_ = _tmp47_;
-#line 1336 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (_tmp43_);
-#line 1336 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				icon = _tmp48_;
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp49_ = icon;
-#line 1337 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_widget_set_visible ((GtkWidget*) _tmp49_, TRUE);
-#line 1338 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp50_ = page_box;
-#line 1338 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp51_ = icon;
-#line 1338 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_box_pack_start (_tmp50_, (GtkWidget*) _tmp51_, FALSE, FALSE, (guint) 0);
-#line 1280 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (icon);
 #line 6352 "ui.c"
 			}
 		}
 	}
-#line 1341 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = box;
-#line 1341 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (page_box);
-#line 1341 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 6362 "ui.c"
 }
 
 
 static void user_interface_save_file_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1345 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1347 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
 #line 6373 "ui.c"
 }
 
 
 static void _user_interface_save_file_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_file_button_clicked_cb ((UserInterface*) self, _sender);
 #line 6380 "ui.c"
 }
 
 
 void user_interface_save_document_activate_cb (UserInterface* self) {
-#line 1350 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1352 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
 #line 6389 "ui.c"
 }
@@ -6396,74 +6396,74 @@ static void user_interface_copy_to_clipboard_button_clicked_cb (UserInterface* s
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 1356 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1356 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1358 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1358 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1358 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1358 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1358 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1359 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1359 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ != NULL) {
 #line 6418 "ui.c"
 		Page* _tmp5_ = NULL;
-#line 1360 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = page;
-#line 1360 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_copy_to_clipboard (_tmp5_, (GtkWindow*) self);
 #line 6424 "ui.c"
 	}
-#line 1356 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1356 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
 #line 6428 "ui.c"
 }
 
 
 static void _user_interface_copy_to_clipboard_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_copy_to_clipboard_button_clicked_cb ((UserInterface*) self, _sender);
 #line 6435 "ui.c"
 }
 
 
 static void user_interface_save_as_file_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1364 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1364 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1366 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
 #line 6446 "ui.c"
 }
 
 
 static void _user_interface_save_as_file_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_as_file_button_clicked_cb ((UserInterface*) self, _sender);
 #line 6453 "ui.c"
 }
 
 
 void user_interface_save_as_document_activate_cb (UserInterface* self) {
-#line 1369 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1371 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
 #line 6462 "ui.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 1378 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? cairo_reference (self) : NULL;
 #line 6469 "ui.c"
 }
@@ -6503,116 +6503,116 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op
 	GdkPixbuf* _tmp30_ = NULL;
 	cairo_t* _tmp31_ = NULL;
 	cairo_t* _tmp32_ = NULL;
-#line 1374 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1374 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (operation != NULL);
-#line 1374 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (print_context != NULL);
-#line 1378 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = print_context;
-#line 1378 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_print_context_get_cairo_context (_tmp0_);
-#line 1378 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _cairo_reference0 (_tmp1_);
-#line 1378 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	context = _tmp2_;
-#line 1379 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->_book;
-#line 1379 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_number;
-#line 1379 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_page (_tmp3_, _tmp4_);
-#line 1379 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp5_;
-#line 1382 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	is_landscape = FALSE;
-#line 1383 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = print_context;
-#line 1383 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = gtk_print_context_get_width (_tmp6_);
-#line 1383 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = print_context;
-#line 1383 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = gtk_print_context_get_height (_tmp8_);
-#line 1383 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ > _tmp9_) {
-#line 1384 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		is_landscape = TRUE;
 #line 6543 "ui.c"
 	}
-#line 1385 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = page;
-#line 1385 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = page_get_is_landscape (_tmp10_);
-#line 1385 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = _tmp11_;
-#line 1385 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = is_landscape;
-#line 1385 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp12_ != _tmp13_) {
 #line 6555 "ui.c"
 		cairo_t* _tmp14_ = NULL;
 		GtkPrintContext* _tmp15_ = NULL;
 		gdouble _tmp16_ = 0.0;
 		cairo_t* _tmp17_ = NULL;
-#line 1387 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = context;
-#line 1387 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = print_context;
-#line 1387 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = gtk_print_context_get_width (_tmp15_);
-#line 1387 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1387 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		cairo_translate (_tmp14_, _tmp16_, (gdouble) 0);
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = context;
-#line 1388 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		cairo_rotate (_tmp17_, G_PI_2);
 #line 6572 "ui.c"
 	}
-#line 1391 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = context;
-#line 1391 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = print_context;
-#line 1391 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = gtk_print_context_get_dpi_x (_tmp19_);
-#line 1391 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = page;
-#line 1391 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = page_get_dpi (_tmp21_);
-#line 1391 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = _tmp22_;
-#line 1391 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = print_context;
-#line 1391 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = gtk_print_context_get_dpi_y (_tmp24_);
-#line 1391 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = page;
-#line 1391 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = page_get_dpi (_tmp26_);
-#line 1391 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = _tmp27_;
-#line 1391 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1391 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_scale (_tmp18_, _tmp20_ / _tmp23_, _tmp25_ / _tmp28_);
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = page;
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = page_get_image (_tmp29_, TRUE);
-#line 1394 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	image = _tmp30_;
-#line 1395 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = context;
-#line 1395 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gdk_cairo_set_source_pixbuf (_tmp31_, image, (gdouble) 0, (gdouble) 0);
-#line 1396 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = context;
-#line 1396 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_paint (_tmp32_);
-#line 1374 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (image);
-#line 1374 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 1374 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_cairo_destroy0 (context);
 #line 6618 "ui.c"
 }
@@ -6622,24 +6622,24 @@ static void user_interface_email_button_clicked_cb (UserInterface* self, GtkWidg
 	const gchar* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1400 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1400 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1402 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->document_hint;
-#line 1402 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1402 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1402 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
 #line 6638 "ui.c"
 }
 
 
 static void _user_interface_email_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_email_button_clicked_cb ((UserInterface*) self, _sender);
 #line 6645 "ui.c"
 }
@@ -6649,22 +6649,22 @@ void user_interface_email_document_activate_cb (UserInterface* self) {
 	const gchar* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1405 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1407 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->document_hint;
-#line 1407 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1407 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1407 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
 #line 6663 "ui.c"
 }
 
 
 static void _user_interface_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self) {
-#line 1414 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_draw_page ((UserInterface*) self, _sender, context, page_nr);
 #line 6670 "ui.c"
 }
@@ -6678,27 +6678,27 @@ static void user_interface_print_document (UserInterface* self) {
 	guint _tmp3_ = 0U;
 	guint _tmp6_ = 0U;
 	GError * _inner_error_ = NULL;
-#line 1410 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1412 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_print_operation_new ();
-#line 1412 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	print = _tmp0_;
-#line 1413 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 1413 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 1413 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1413 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_set (print, "n-pages", (gint) _tmp3_, NULL);
-#line 1414 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (print, "draw-page", (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self, 0);
 #line 6698 "ui.c"
 	{
-#line 1418 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, (GtkWindow*) self, &_inner_error_);
-#line 1418 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6704 "ui.c"
 			goto __catch19_g_error;
@@ -6710,65 +6710,65 @@ static void user_interface_print_document (UserInterface* self) {
 		GError* e = NULL;
 		GError* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 1416 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1416 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1422 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = e;
-#line 1422 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp4_->message;
-#line 1422 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_warning ("ui.vala:1422: Error printing: %s", _tmp5_);
-#line 1416 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
 #line 6726 "ui.c"
 	}
 	__finally19:
-#line 1416 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1416 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (print);
-#line 1416 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.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 1416 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1416 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 6739 "ui.c"
 	}
-#line 1425 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("draw-page", gtk_print_operation_get_type (), &_tmp6_, NULL, FALSE);
-#line 1425 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (print, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self);
-#line 1410 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (print);
 #line 6747 "ui.c"
 }
 
 
 static void user_interface_print_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
-#line 1429 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1429 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1431 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1431 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document (self);
 #line 6758 "ui.c"
 }
 
 
 static void _user_interface_print_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_button_clicked_cb ((UserInterface*) self, _sender);
 #line 6765 "ui.c"
 }
 
 
 void user_interface_print_document_activate_cb (UserInterface* self) {
-#line 1434 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1436 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document (self);
 #line 6774 "ui.c"
 }
@@ -6776,22 +6776,22 @@ void user_interface_print_document_activate_cb (UserInterface* self) {
 
 static void user_interface_launch_help (UserInterface* self) {
 	GError * _inner_error_ = NULL;
-#line 1439 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
 #line 6782 "ui.c"
 	{
 		GdkScreen* _tmp0_ = NULL;
 		GdkScreen* _tmp1_ = NULL;
 		guint32 _tmp2_ = 0U;
-#line 1443 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = gtk_window_get_screen ((GtkWindow*) self);
-#line 1443 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = _tmp0_;
-#line 1443 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_get_current_event_time ();
-#line 1443 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_show_uri (_tmp1_, "help:simple-scan", _tmp2_, &_inner_error_);
-#line 1443 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6797 "ui.c"
 			goto __catch20_g_error;
@@ -6804,30 +6804,30 @@ static void user_interface_launch_help (UserInterface* self) {
 		const gchar* _tmp3_ = NULL;
 		GError* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 1441 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1441 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1447 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _ ("Unable to open help file");
-#line 1447 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = e;
-#line 1447 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp4_->message;
-#line 1447 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp3_, _tmp5_);
-#line 1441 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
 #line 6822 "ui.c"
 	}
 	__finally20:
-#line 1441 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1441 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.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 1441 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1441 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 6833 "ui.c"
 	}
@@ -6835,27 +6835,27 @@ static void user_interface_launch_help (UserInterface* self) {
 
 
 static void user_interface_help_contents_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1454 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1454 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1456 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_launch_help (self);
 #line 6845 "ui.c"
 }
 
 
 static void _user_interface_help_contents_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_help_contents_menuitem_activate_cb ((UserInterface*) self, _sender);
 #line 6852 "ui.c"
 }
 
 
 void user_interface_help_contents_activate_cb (UserInterface* self) {
-#line 1459 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1461 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_launch_help (self);
 #line 6861 "ui.c"
 }
@@ -6877,21 +6877,21 @@ static void user_interface_show_about (UserInterface* self) {
 	const gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
 	const gchar* _tmp8_ = NULL;
-#line 1464 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1466 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("Robert Ancell <robert.ancell@canonical.com>");
-#line 1466 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_new0 (gchar*, 1 + 1);
-#line 1466 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_[0] = _tmp0_;
-#line 1466 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors = _tmp1_;
-#line 1466 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors_length1 = 1;
-#line 1466 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_authors_size_ = authors_length1;
-#line 1469 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _ ("This program is free software: you can redistribute it and/or modify\n" \
 "it under the terms of the GNU General Public License as published by\n" \
 "the Free Software Foundation, either version 3 of the License, or\n" \
@@ -6904,60 +6904,60 @@ static void user_interface_show_about (UserInterface* self) {
 "\n" \
 "You should have received a copy of the GNU General Public License\n" \
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.");
-#line 1469 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1469 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	license = _tmp3_;
-#line 1472 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _ ("About Simple Scan");
-#line 1472 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 1472 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	title = _tmp5_;
-#line 1475 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _ ("Simple document scanning tool");
-#line 1475 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 1475 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	description = _tmp7_;
-#line 1477 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("translator-credits");
-#line 1477 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1477 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_show_about_dialog ((GtkWindow*) self, "title", title, "program-name", "Simple Scan", "version", VERSION, "comments", description, "logo-icon-name", "scanner", "authors", authors, "translator-credits", _tmp8_, "website", "https://launchpad.net/simple-scan", "copyright", "Copyright © 2009-2011 Canonical Ltd.", "license", license, "wrap-license", TRUE, NULL, NULL);
-#line 1464 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (description);
-#line 1464 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (title);
-#line 1464 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (license);
-#line 1464 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors = (_vala_array_free (authors, authors_length1, (GDestroyNotify) g_free), NULL);
 #line 6925 "ui.c"
 }
 
 
 static void user_interface_about_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1493 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1493 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1495 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_about (self);
 #line 6936 "ui.c"
 }
 
 
 static void _user_interface_about_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_about_menuitem_activate_cb ((UserInterface*) self, _sender);
 #line 6943 "ui.c"
 }
 
 
 void user_interface_about_activate_cb (UserInterface* self) {
-#line 1498 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1500 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_about (self);
 #line 6952 "ui.c"
 }
@@ -6970,66 +6970,66 @@ static gboolean user_interface_on_quit (UserInterface* self) {
 	gboolean _tmp2_ = FALSE;
 	guint _tmp3_ = 0U;
 	AutosaveManager* _tmp4_ = NULL;
-#line 1503 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1505 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Save document before quitting?");
-#line 1505 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Quit without Saving");
-#line 1505 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
-#line 1505 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 1509 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 1509 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
 #line 6977 "ui.c"
 	}
-#line 1511 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) self);
-#line 1513 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->save_state_timeout;
-#line 1513 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_ != ((guint) 0)) {
-#line 1514 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, TRUE);
 #line 6987 "ui.c"
 	}
-#line 1516 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->autosave_manager;
-#line 1516 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	autosave_manager_cleanup (_tmp4_);
-#line 1518 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 1518 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1518 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 6997 "ui.c"
 }
 
 
 static void user_interface_quit_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
-#line 1522 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1522 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1524 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
 #line 7008 "ui.c"
 }
 
 
 static void _user_interface_quit_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_quit_menuitem_activate_cb ((UserInterface*) self, _sender);
 #line 7015 "ui.c"
 }
 
 
 void user_interface_quit_activate_cb (UserInterface* self) {
-#line 1527 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1527 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1529 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
 #line 7024 "ui.c"
 }
@@ -7038,40 +7038,40 @@ void user_interface_quit_activate_cb (UserInterface* self) {
 static gboolean user_interface_simple_scan_window_configure_event_cb (UserInterface* self, GtkWidget* widget, GdkEventConfigure* event) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1533 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1533 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1533 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1535 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->window_is_maximized;
-#line 1535 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp0_) {
 #line 7041 "ui.c"
 		GdkEventConfigure* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 		GdkEventConfigure* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 1537 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = event;
-#line 1537 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = _tmp1_->width;
-#line 1537 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_width = _tmp2_;
-#line 1538 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = event;
-#line 1538 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _tmp3_->height;
-#line 1538 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_height = _tmp4_;
-#line 1539 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, FALSE);
 #line 7060 "ui.c"
 	}
-#line 1542 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1542 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 7066 "ui.c"
 }
@@ -7080,7 +7080,7 @@ static gboolean user_interface_simple_scan_window_configure_event_cb (UserInterf
 static gboolean _user_interface_simple_scan_window_configure_event_cb_gtk_widget_configure_event (GtkWidget* _sender, GdkEventConfigure* event, gpointer self) {
 	gboolean result;
 	result = user_interface_simple_scan_window_configure_event_cb ((UserInterface*) self, _sender, event);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 7075 "ui.c"
 }
@@ -7088,38 +7088,38 @@ static gboolean _user_interface_simple_scan_window_configure_event_cb_gtk_widget
 
 static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar* widget, gint response_id) {
 	gint _tmp0_ = 0;
-#line 1545 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1545 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1547 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = response_id;
-#line 1547 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_ == 1) {
 #line 7089 "ui.c"
 		GtkComboBox* _tmp1_ = NULL;
 		GtkDialog* _tmp2_ = NULL;
-#line 1549 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = self->priv->device_combo;
-#line 1549 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_grab_focus ((GtkWidget*) _tmp1_);
-#line 1550 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = self->priv->preferences_dialog;
-#line 1550 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_window_present ((GtkWindow*) _tmp2_);
 #line 7100 "ui.c"
 	} else {
-#line 1554 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->have_error = FALSE;
-#line 1555 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (self->priv->error_title);
-#line 1555 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->error_title = NULL;
-#line 1556 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (self->priv->error_text);
-#line 1556 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->error_text = NULL;
-#line 1557 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_update_info_bar (self);
 #line 7114 "ui.c"
 	}
@@ -7130,34 +7130,34 @@ static gboolean user_interface_simple_scan_window_window_state_event_cb (UserInt
 	gboolean result = FALSE;
 	GdkEventWindowState* _tmp0_ = NULL;
 	GdkWindowState _tmp1_ = 0;
-#line 1562 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1562 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1562 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1564 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = event;
-#line 1564 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_->changed_mask;
-#line 1564 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((_tmp1_ & GDK_WINDOW_STATE_MAXIMIZED) != 0) {
 #line 7135 "ui.c"
 		GdkEventWindowState* _tmp2_ = NULL;
 		GdkWindowState _tmp3_ = 0;
-#line 1566 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = event;
-#line 1566 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _tmp2_->new_window_state;
-#line 1566 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_is_maximized = (_tmp3_ & GDK_WINDOW_STATE_MAXIMIZED) != 0;
-#line 1567 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, FALSE);
 #line 7146 "ui.c"
 	}
-#line 1569 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1569 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 7152 "ui.c"
 }
@@ -7166,7 +7166,7 @@ static gboolean user_interface_simple_scan_window_window_state_event_cb (UserInt
 static gboolean _user_interface_simple_scan_window_window_state_event_cb_gtk_widget_window_state_event (GtkWidget* _sender, GdkEventWindowState* event, gpointer self) {
 	gboolean result;
 	result = user_interface_simple_scan_window_window_state_event_cb ((UserInterface*) self, _sender, event);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 7161 "ui.c"
 }
@@ -7175,17 +7175,17 @@ static gboolean _user_interface_simple_scan_window_window_state_event_cb_gtk_wid
 static gboolean user_interface_window_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1573 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1573 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1573 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1575 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_on_quit (self);
-#line 1575 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = !_tmp0_;
-#line 1575 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1575 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 7180 "ui.c"
 }
@@ -7194,7 +7194,7 @@ static gboolean user_interface_window_delete_event_cb (UserInterface* self, GtkW
 static gboolean _user_interface_window_delete_event_cb_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = user_interface_window_delete_event_cb ((UserInterface*) self, _sender, event);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 7189 "ui.c"
 }
@@ -7210,35 +7210,35 @@ static void user_interface_page_size_changed_cb (UserInterface* self, Page* page
 	Page* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 1578 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1578 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1580 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1580 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_width (_tmp0_);
-#line 1580 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1580 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_width = _tmp2_;
-#line 1581 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page;
-#line 1581 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_get_height (_tmp3_);
-#line 1581 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1581 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_height = _tmp5_;
-#line 1582 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = page;
-#line 1582 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = page_get_dpi (_tmp6_);
-#line 1582 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _tmp7_;
-#line 1582 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_dpi = _tmp8_;
-#line 1583 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, FALSE);
 #line 7233 "ui.c"
 }
@@ -7248,33 +7248,33 @@ static void user_interface_page_scan_direction_changed_cb (UserInterface* self,
 	Page* _tmp0_ = NULL;
 	ScanDirection _tmp1_ = 0;
 	ScanDirection _tmp2_ = 0;
-#line 1586 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1586 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1588 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1588 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_scan_direction (_tmp0_);
-#line 1588 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1588 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_scan_direction = _tmp2_;
-#line 1589 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, FALSE);
 #line 7255 "ui.c"
 }
 
 
 static void _user_interface_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self) {
-#line 1596 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_size_changed_cb ((UserInterface*) self, _sender);
 #line 7262 "ui.c"
 }
 
 
 static void _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self) {
-#line 1597 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_scan_direction_changed_cb ((UserInterface*) self, _sender);
 #line 7269 "ui.c"
 }
@@ -7287,44 +7287,44 @@ static void user_interface_page_added_cb (UserInterface* self, Book* book, Page*
 	ScanDirection _tmp3_ = 0;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1592 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1592 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1592 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1594 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1594 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_size_changed_cb (self, _tmp0_);
-#line 1595 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page;
-#line 1595 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page_get_scan_direction (_tmp1_);
-#line 1595 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1595 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_scan_direction = _tmp3_;
-#line 1596 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1596 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp4_, "size-changed", (GCallback) _user_interface_page_size_changed_cb_page_size_changed, self, 0);
-#line 1597 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1597 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp5_, "scan-direction-changed", (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self, 0);
-#line 1599 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
 #line 7308 "ui.c"
 }
 
 
 static void user_interface_reordered_cb (UserInterface* self, Book* book) {
-#line 1602 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1602 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1604 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
 #line 7319 "ui.c"
 }
@@ -7338,37 +7338,37 @@ static void user_interface_page_removed_cb (UserInterface* self, Book* book, Pag
 	Book* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
 	guint _tmp6_ = 0U;
-#line 1607 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1607 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1607 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1609 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1609 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("size-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 1609 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _user_interface_page_size_changed_cb_page_size_changed, self);
-#line 1610 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page;
-#line 1610 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("scan-direction-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 1610 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self);
-#line 1613 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book;
-#line 1613 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_n_pages (_tmp4_);
-#line 1613 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _tmp5_;
-#line 1613 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_ == ((guint) 0)) {
-#line 1614 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_add_default_page (self);
 #line 7359 "ui.c"
 	}
-#line 1616 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
 #line 7363 "ui.c"
 }
@@ -7392,61 +7392,61 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 	gint _scan_resolutions_size_ = 0;
 	gint* _tmp10_ = NULL;
 	gint _tmp10__length1 = 0;
-#line 1619 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1619 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (combo != NULL);
-#line 1621 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1621 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1621 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp0_;
-#line 1622 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = combo;
-#line 1622 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = renderer;
-#line 1622 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp1_, (GtkCellRenderer*) _tmp2_, TRUE);
-#line 1623 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = combo;
-#line 1623 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = renderer;
-#line 1623 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp3_, (GtkCellRenderer*) _tmp4_, "text", 1);
-#line 1625 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = combo;
-#line 1625 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = gtk_combo_box_get_model (_tmp5_);
-#line 1625 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _tmp6_;
-#line 1625 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_list_store_get_type ()) ? ((GtkListStore*) _tmp7_) : NULL);
-#line 1625 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	model = _tmp8_;
-#line 1626 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = g_new0 (gint, 6);
-#line 1626 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[0] = 75;
-#line 1626 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[1] = 150;
-#line 1626 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[2] = 300;
-#line 1626 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[3] = 600;
-#line 1626 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[4] = 1200;
-#line 1626 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_[5] = 2400;
-#line 1626 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions = _tmp9_;
-#line 1626 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions_length1 = 6;
-#line 1626 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_resolutions_size_ = scan_resolutions_length1;
-#line 1627 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = scan_resolutions;
-#line 1627 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10__length1 = scan_resolutions_length1;
 #line 7441 "ui.c"
 	{
@@ -7454,15 +7454,15 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 		gint dpi_collection_length1 = 0;
 		gint _dpi_collection_size_ = 0;
 		gint dpi_it = 0;
-#line 1627 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi_collection = _tmp10_;
-#line 1627 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi_collection_length1 = _tmp10__length1;
-#line 1627 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (dpi_it = 0; dpi_it < _tmp10__length1; dpi_it = dpi_it + 1) {
 #line 7453 "ui.c"
 			gint dpi = 0;
-#line 1627 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			dpi = dpi_collection[dpi_it];
 #line 7457 "ui.c"
 			{
@@ -7478,131 +7478,131 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 				const gchar* _tmp32_ = NULL;
 				gint _tmp33_ = 0;
 				gint _tmp34_ = 0;
-#line 1630 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp11_ = dpi;
-#line 1630 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp12_ = default_dpi;
-#line 1630 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp11_ == _tmp12_) {
 #line 7477 "ui.c"
 					const gchar* _tmp13_ = NULL;
 					gint _tmp14_ = 0;
 					gchar* _tmp15_ = NULL;
-#line 1632 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp13_ = _ ("%d dpi (default)");
-#line 1632 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp14_ = dpi;
-#line 1632 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp15_ = g_strdup_printf (_tmp13_, _tmp14_);
-#line 1632 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (label);
-#line 1632 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					label = _tmp15_;
 #line 7491 "ui.c"
 				} else {
 					gint _tmp16_ = 0;
-#line 1633 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp16_ = dpi;
-#line 1633 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					if (_tmp16_ == 75) {
 #line 7498 "ui.c"
 						const gchar* _tmp17_ = NULL;
 						gint _tmp18_ = 0;
 						gchar* _tmp19_ = NULL;
-#line 1635 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp17_ = _ ("%d dpi (draft)");
-#line 1635 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp18_ = dpi;
-#line 1635 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp19_ = g_strdup_printf (_tmp17_, _tmp18_);
-#line 1635 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_g_free0 (label);
-#line 1635 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						label = _tmp19_;
 #line 7512 "ui.c"
 					} else {
 						gint _tmp20_ = 0;
-#line 1636 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp20_ = dpi;
-#line 1636 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						if (_tmp20_ == 1200) {
 #line 7519 "ui.c"
 							const gchar* _tmp21_ = NULL;
 							gint _tmp22_ = 0;
 							gchar* _tmp23_ = NULL;
-#line 1638 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp21_ = _ ("%d dpi (high resolution)");
-#line 1638 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp22_ = dpi;
-#line 1638 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp23_ = g_strdup_printf (_tmp21_, _tmp22_);
-#line 1638 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
-#line 1638 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp23_;
 #line 7533 "ui.c"
 						} else {
 							const gchar* _tmp24_ = NULL;
 							gint _tmp25_ = 0;
 							gchar* _tmp26_ = NULL;
-#line 1641 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp24_ = _ ("%d dpi");
-#line 1641 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp25_ = dpi;
-#line 1641 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp26_ = g_strdup_printf (_tmp24_, _tmp25_);
-#line 1641 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
-#line 1641 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1641 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							label = _tmp26_;
 #line 7548 "ui.c"
 						}
 					}
 				}
-#line 1644 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp27_ = model;
-#line 1644 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_list_store_append (_tmp27_, &_tmp28_);
-#line 1644 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				iter = _tmp28_;
-#line 1645 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp29_ = model;
-#line 1645 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp30_ = iter;
-#line 1645 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp31_ = dpi;
-#line 1645 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp32_ = label;
-#line 1645 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				gtk_list_store_set (_tmp29_, &_tmp30_, 0, _tmp31_, 1, _tmp32_, -1, -1);
-#line 1647 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp33_ = dpi;
-#line 1647 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp34_ = current_dpi;
-#line 1647 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1647 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp33_ == _tmp34_) {
 #line 7574 "ui.c"
 					GtkComboBox* _tmp35_ = NULL;
 					GtkTreeIter _tmp36_ = {0};
-#line 1648 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp35_ = combo;
-#line 1648 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp36_ = iter;
-#line 1648 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_combo_box_set_active_iter (_tmp35_, &_tmp36_);
 #line 7583 "ui.c"
 				}
-#line 1627 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (label);
 #line 7587 "ui.c"
 			}
 		}
 	}
-#line 1619 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions = (g_free (scan_resolutions), NULL);
-#line 1619 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (model);
-#line 1619 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
 #line 7597 "ui.c"
 }
@@ -7625,66 +7625,66 @@ static void user_interface_needs_saving_cb (UserInterface* self, Book* book) {
 	gboolean _tmp13_ = FALSE;
 	gboolean _tmp14_ = FALSE;
 	GtkMenuItem* _tmp16_ = NULL;
-#line 1652 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1652 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1652 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1654 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->save_menuitem;
-#line 1654 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book;
-#line 1654 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_needs_saving (_tmp1_);
-#line 1654 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1654 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp3_);
-#line 1655 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->save_button;
-#line 1655 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book;
-#line 1655 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_needs_saving (_tmp5_);
-#line 1655 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _tmp6_;
-#line 1655 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp4_, _tmp7_);
-#line 1656 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->save_toolbutton;
-#line 1656 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = book;
-#line 1656 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = book_get_needs_saving (_tmp9_);
-#line 1656 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = _tmp10_;
-#line 1656 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp8_, _tmp11_);
-#line 1657 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = book;
-#line 1657 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = book_get_needs_saving (_tmp12_);
-#line 1657 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = _tmp13_;
-#line 1657 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp14_) {
 #line 7660 "ui.c"
 		GtkMenuItem* _tmp15_ = NULL;
-#line 1658 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = self->priv->save_as_menuitem;
-#line 1658 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp15_, TRUE);
 #line 7666 "ui.c"
 	}
-#line 1659 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = self->priv->copy_to_clipboard_menuitem;
-#line 1659 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp16_, TRUE);
 #line 7672 "ui.c"
 }
 
 
 static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self) {
-#line 1719 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_info_bar_response_cb ((UserInterface*) self, _sender, response_id);
 #line 7679 "ui.c"
 }
@@ -7693,18 +7693,18 @@ static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoB
 static void __lambda11_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 1761 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1761 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_text_dpi (self);
-#line 1761 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "text-dpi", _tmp1_);
 #line 7692 "ui.c"
 }
 
 
 static void ___lambda11__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1761 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda11_ ((UserInterface*) self);
 #line 7699 "ui.c"
 }
@@ -7713,18 +7713,18 @@ static void ___lambda11__gtk_combo_box_changed (GtkComboBox* _sender, gpointer s
 static void __lambda12_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 1766 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1766 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_photo_dpi (self);
-#line 1766 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "photo-dpi", _tmp1_);
 #line 7712 "ui.c"
 }
 
 
 static void ___lambda12__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1766 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda12_ ((UserInterface*) self);
 #line 7719 "ui.c"
 }
@@ -7733,18 +7733,18 @@ static void ___lambda12__gtk_combo_box_changed (GtkComboBox* _sender, gpointer s
 static void __lambda13_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	ScanType _tmp1_ = 0;
-#line 1776 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1776 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_page_side (self);
-#line 1776 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_enum (_tmp0_, "page-side", (gint) _tmp1_);
 #line 7732 "ui.c"
 }
 
 
 static void ___lambda13__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1776 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda13_ ((UserInterface*) self);
 #line 7739 "ui.c"
 }
@@ -7757,26 +7757,26 @@ static void __lambda14_ (UserInterface* self) {
 	gint _tmp1_ = 0;
 	GSettings* _tmp2_ = NULL;
 	GSettings* _tmp3_ = NULL;
-#line 1787 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_get_paper_size (self, &_tmp0_, &_tmp1_);
-#line 1787 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	w = _tmp0_;
-#line 1787 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	h = _tmp1_;
-#line 1788 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->settings;
-#line 1788 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp2_, "paper-width", w);
-#line 1789 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->settings;
-#line 1789 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp3_, "paper-height", h);
 #line 7764 "ui.c"
 }
 
 
 static void ___lambda14__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1784 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda14_ ((UserInterface*) self);
 #line 7771 "ui.c"
 }
@@ -7786,20 +7786,20 @@ static void __lambda15_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1800 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1800 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_brightness (self);
-#line 1800 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1800 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "brightness", _tmp2_);
 #line 7787 "ui.c"
 }
 
 
 static void ___lambda15__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1800 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda15_ ((UserInterface*) self);
 #line 7794 "ui.c"
 }
@@ -7809,20 +7809,20 @@ static void __lambda16_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1810 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1810 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_contrast (self);
-#line 1810 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1810 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "contrast", _tmp2_);
 #line 7810 "ui.c"
 }
 
 
 static void ___lambda16__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1810 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda16_ ((UserInterface*) self);
 #line 7817 "ui.c"
 }
@@ -7832,48 +7832,48 @@ static void __lambda17_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1820 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1820 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1820 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1820 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "jpeg-quality", _tmp2_);
 #line 7833 "ui.c"
 }
 
 
 static void ___lambda17__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1820 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	__lambda17_ ((UserInterface*) self);
 #line 7840 "ui.c"
 }
 
 
 static void _user_interface_page_selected_cb_book_view_page_selected (BookView* _sender, Page* page, gpointer self) {
-#line 1836 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_selected_cb ((UserInterface*) self, _sender, page);
 #line 7847 "ui.c"
 }
 
 
 static void _user_interface_show_page_cb_book_view_show_page (BookView* _sender, Page* page, gpointer self) {
-#line 1837 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_page_cb ((UserInterface*) self, _sender, page);
 #line 7854 "ui.c"
 }
 
 
 static void _user_interface_show_page_menu_cb_book_view_show_menu (BookView* _sender, gpointer self) {
-#line 1838 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_page_menu_cb ((UserInterface*) self, _sender);
 #line 7861 "ui.c"
 }
 
 
 static void _user_interface_book_saving_cb_book_saving (Book* _sender, gint i, gpointer self) {
-#line 1857 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_book_saving_cb ((UserInterface*) self, i);
 #line 7868 "ui.c"
 }
@@ -8085,75 +8085,75 @@ static void user_interface_load (UserInterface* self) {
 	const gchar* _tmp242_ = NULL;
 	ProgressBarDialog* _tmp243_ = NULL;
 	Book* _tmp244_ = NULL;
-#line 1662 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1664 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_icon_theme_get_default ();
-#line 1664 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_icon_theme_append_search_path (_tmp0_, ICON_DIR);
-#line 1666 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_default_icon_name ("scanner");
-#line 1668 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_application_get_default ();
-#line 1668 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_application_get_type ()) ? ((GtkApplication*) _tmp1_) : NULL);
-#line 1668 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	app = _tmp2_;
-#line 1670 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = user_interface_is_desktop (self, "Unity");
-#line 1670 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_) {
-#line 1670 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = TRUE;
 #line 8098 "ui.c"
 	} else {
 		gboolean _tmp7_ = FALSE;
-#line 1670 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = user_interface_is_desktop (self, "XFCE");
-#line 1670 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp7_;
 #line 8105 "ui.c"
 	}
-#line 1670 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_) {
-#line 1670 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = TRUE;
 #line 8111 "ui.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
-#line 1670 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = user_interface_is_desktop (self, "MATE");
-#line 1670 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = _tmp8_;
 #line 8118 "ui.c"
 	}
-#line 1670 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 1670 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = TRUE;
 #line 8124 "ui.c"
 	} else {
 		gboolean _tmp9_ = FALSE;
-#line 1670 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = user_interface_is_desktop (self, "LXDE");
-#line 1670 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _tmp9_;
 #line 8131 "ui.c"
 	}
-#line 1670 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
 #line 8135 "ui.c"
 		GtkMenuBar* _tmp10_ = NULL;
 		GtkToolbar* _tmp11_ = NULL;
-#line 1672 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_window_set_titlebar ((GtkWindow*) self, NULL);
-#line 1673 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = self->priv->menubar;
-#line 1673 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_visible ((GtkWidget*) _tmp10_, TRUE);
-#line 1674 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = self->priv->toolbar;
-#line 1674 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
 #line 8148 "ui.c"
 	} else {
@@ -8207,839 +8207,839 @@ static void user_interface_load (UserInterface* self) {
 		GtkApplication* _tmp56_ = NULL;
 		GtkApplication* _tmp57_ = NULL;
 		GtkApplication* _tmp58_ = NULL;
-#line 1678 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = app;
-#line 1678 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_action_map_add_action_entries ((GActionMap*) _tmp12_, USER_INTERFACE_action_entries, G_N_ELEMENTS (USER_INTERFACE_action_entries), self);
-#line 1680 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = g_menu_new ();
-#line 1680 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		appmenu = _tmp13_;
-#line 1681 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = g_menu_new ();
-#line 1681 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp14_;
-#line 1682 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = appmenu;
-#line 1682 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = section;
-#line 1682 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp15_, NULL, (GMenuModel*) _tmp16_);
-#line 1683 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = section;
-#line 1683 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp18_ = _ ("New Document");
-#line 1683 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp17_, _tmp18_, "app.new_document");
-#line 1685 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = g_menu_new ();
-#line 1685 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1685 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp19_;
-#line 1686 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp20_ = appmenu;
-#line 1686 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp21_ = section;
-#line 1686 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp20_, NULL, (GMenuModel*) _tmp21_);
-#line 1687 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp22_ = g_menu_new ();
-#line 1687 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		menu = _tmp22_;
-#line 1688 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp23_ = section;
-#line 1688 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp24_ = _ ("Document");
-#line 1688 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp25_ = menu;
-#line 1688 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_submenu (_tmp23_, _tmp24_, (GMenuModel*) _tmp25_);
-#line 1689 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp26_ = menu;
-#line 1689 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp27_ = _ ("Reorder Pages");
-#line 1689 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp26_, _tmp27_, "app.reorder");
-#line 1690 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp28_ = menu;
-#line 1690 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp29_ = _ ("Save");
-#line 1690 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp28_, _tmp29_, "app.save");
-#line 1691 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp30_ = menu;
-#line 1691 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = _ ("Save As...");
-#line 1691 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp30_, _tmp31_, "app.save_as");
-#line 1692 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp32_ = menu;
-#line 1692 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp33_ = _ ("Email...");
-#line 1692 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp32_, _tmp33_, "app.email");
-#line 1693 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp34_ = menu;
-#line 1693 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp35_ = _ ("Print...");
-#line 1693 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp34_, _tmp35_, "app.print");
-#line 1695 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp36_ = g_menu_new ();
-#line 1695 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1695 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp36_;
-#line 1696 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp37_ = appmenu;
-#line 1696 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp38_ = section;
-#line 1696 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp37_, NULL, (GMenuModel*) _tmp38_);
-#line 1697 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp39_ = section;
-#line 1697 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp40_ = _ ("Preferences");
-#line 1697 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp39_, _tmp40_, "app.preferences");
-#line 1699 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp41_ = g_menu_new ();
-#line 1699 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1699 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		section = _tmp41_;
-#line 1700 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp42_ = appmenu;
-#line 1700 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp43_ = section;
-#line 1700 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append_section (_tmp42_, NULL, (GMenuModel*) _tmp43_);
-#line 1701 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp44_ = section;
-#line 1701 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp45_ = _ ("Help");
-#line 1701 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp44_, _tmp45_, "app.help");
-#line 1702 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp46_ = section;
-#line 1702 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp47_ = _ ("About");
-#line 1702 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp46_, _tmp47_, "app.about");
-#line 1703 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp48_ = section;
-#line 1703 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp49_ = _ ("Quit");
-#line 1703 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_menu_append (_tmp48_, _tmp49_, "app.quit");
-#line 1705 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp50_ = app;
-#line 1705 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp51_ = appmenu;
-#line 1705 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_set_app_menu (_tmp50_, (GMenuModel*) _tmp51_);
-#line 1707 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp52_ = app;
-#line 1707 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp52_, "<Ctrl>N", "app.new_document", NULL);
-#line 1708 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp53_ = app;
-#line 1708 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp53_, "<Ctrl>S", "app.save", NULL);
-#line 1709 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp54_ = app;
-#line 1709 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp54_, "<Shift><Ctrl>S", "app.save_as", NULL);
-#line 1710 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp55_ = app;
-#line 1710 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp55_, "<Ctrl>E", "app.email", NULL);
-#line 1711 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp56_ = app;
-#line 1711 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp56_, "<Ctrl>P", "app.print", NULL);
-#line 1712 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp57_ = app;
-#line 1712 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp57_, "F1", "app.help", NULL);
-#line 1713 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp58_ = app;
-#line 1713 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_application_add_accelerator (_tmp58_, "<Ctrl>Q", "app.quit", NULL);
-#line 1670 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (menu);
-#line 1670 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (section);
-#line 1670 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (appmenu);
 #line 8366 "ui.c"
 	}
-#line 1715 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp59_ = app;
-#line 1715 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_application_add_window (_tmp59_, (GtkWindow*) self);
-#line 1718 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp60_ = (GtkInfoBar*) gtk_info_bar_new ();
-#line 1718 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp60_);
-#line 1718 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar);
-#line 1718 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar = _tmp60_;
-#line 1719 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp61_ = self->priv->info_bar;
-#line 1719 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp61_, "response", (GCallback) _user_interface_info_bar_response_cb_gtk_info_bar_response, self, 0);
-#line 1720 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp62_ = self->priv->main_vbox;
-#line 1720 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp63_ = self->priv->info_bar;
-#line 1720 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp62_, (GtkWidget*) _tmp63_, FALSE, TRUE, (guint) 0);
-#line 1721 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp64_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-#line 1721 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp64_);
-#line 1721 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1721 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	hbox = _tmp64_;
-#line 1722 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp65_ = self->priv->info_bar;
-#line 1722 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp66_ = gtk_info_bar_get_content_area (_tmp65_);
-#line 1722 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp67_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp66_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp66_) : NULL);
-#line 1722 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	content_area = _tmp67_;
-#line 1723 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp68_ = content_area;
-#line 1723 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp69_ = hbox;
-#line 1723 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add (_tmp68_, (GtkWidget*) _tmp69_);
-#line 1724 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp70_ = hbox;
-#line 1724 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp70_, TRUE);
-#line 1726 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp71_ = (GtkImage*) gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG);
-#line 1726 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp71_);
-#line 1726 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_image);
-#line 1726 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_image = _tmp71_;
-#line 1727 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp72_ = hbox;
-#line 1727 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp73_ = self->priv->info_bar_image;
-#line 1727 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp72_, (GtkWidget*) _tmp73_, FALSE, TRUE, (guint) 0);
-#line 1728 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp74_ = self->priv->info_bar_image;
-#line 1728 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp74_, TRUE);
-#line 1730 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp75_ = (GtkLabel*) gtk_label_new (NULL);
-#line 1730 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp75_);
-#line 1730 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_label);
-#line 1730 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_label = _tmp75_;
-#line 1731 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp76_ = self->priv->info_bar_label;
-#line 1731 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_misc_set_alignment ((GtkMisc*) _tmp76_, 0.0f, 0.5f);
-#line 1732 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp77_ = hbox;
-#line 1732 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp78_ = self->priv->info_bar_label;
-#line 1732 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (_tmp77_, (GtkWidget*) _tmp78_, TRUE, TRUE, (guint) 0);
-#line 1733 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp79_ = self->priv->info_bar_label;
-#line 1733 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp79_, TRUE);
-#line 1735 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp80_ = self->priv->info_bar;
-#line 1735 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp81_ = _ ("_Close");
-#line 1735 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp82_ = gtk_info_bar_add_button (_tmp80_, _tmp81_, (gint) GTK_RESPONSE_CLOSE);
-#line 1735 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, gtk_button_get_type ()) ? ((GtkButton*) _tmp82_) : NULL);
-#line 1735 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_close_button);
-#line 1735 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_close_button = _tmp83_;
-#line 1736 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp84_ = self->priv->info_bar;
-#line 1736 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp85_ = _ ("Change _Scanner");
-#line 1736 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp86_ = gtk_info_bar_add_button (_tmp84_, _tmp85_, 1);
-#line 1736 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp87_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp86_, gtk_button_get_type ()) ? ((GtkButton*) _tmp86_) : NULL);
-#line 1736 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
-#line 1736 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->info_bar_change_scanner_button = _tmp87_;
-#line 1740 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp88_ = self->priv->paper_size_model;
-#line 1740 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp88_, &_tmp89_);
-#line 1740 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp89_;
-#line 1741 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp90_ = self->priv->paper_size_model;
-#line 1741 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp91_ = iter;
-#line 1741 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp92_ = _ ("Automatic");
-#line 1741 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp90_, &_tmp91_, 0, 0, 1, 0, 2, _tmp92_, -1, -1);
-#line 1744 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp93_ = self->priv->paper_size_model;
-#line 1744 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp93_, &_tmp94_);
-#line 1744 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp94_;
-#line 1745 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp95_ = self->priv->paper_size_model;
-#line 1745 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp96_ = iter;
-#line 1745 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp95_, &_tmp96_, 0, 1050, 1, 1480, 2, "A6", -1, -1);
-#line 1746 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp97_ = self->priv->paper_size_model;
-#line 1746 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp97_, &_tmp98_);
-#line 1746 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp98_;
-#line 1747 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp99_ = self->priv->paper_size_model;
-#line 1747 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp100_ = iter;
-#line 1747 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp99_, &_tmp100_, 0, 1480, 1, 2100, 2, "A5", -1, -1);
-#line 1748 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp101_ = self->priv->paper_size_model;
-#line 1748 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp101_, &_tmp102_);
-#line 1748 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp102_;
-#line 1749 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp103_ = self->priv->paper_size_model;
-#line 1749 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp104_ = iter;
-#line 1749 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp103_, &_tmp104_, 0, 2100, 1, 2970, 2, "A4", -1, -1);
-#line 1750 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp105_ = self->priv->paper_size_model;
-#line 1750 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp105_, &_tmp106_);
-#line 1750 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp106_;
-#line 1751 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp107_ = self->priv->paper_size_model;
-#line 1751 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp108_ = iter;
-#line 1751 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp107_, &_tmp108_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
-#line 1752 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp109_ = self->priv->paper_size_model;
-#line 1752 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp109_, &_tmp110_);
-#line 1752 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp110_;
-#line 1753 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp111_ = self->priv->paper_size_model;
-#line 1753 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp112_ = iter;
-#line 1753 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp111_, &_tmp112_, 0, 2159, 1, 3556, 2, "Legal", -1, -1);
-#line 1754 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp113_ = self->priv->paper_size_model;
-#line 1754 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_append (_tmp113_, &_tmp114_);
-#line 1754 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp114_;
-#line 1755 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp115_ = self->priv->paper_size_model;
-#line 1755 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp116_ = iter;
-#line 1755 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_list_store_set (_tmp115_, &_tmp116_, 0, 1016, 1, 1524, 2, "4×6", -1, -1);
-#line 1757 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp117_ = self->priv->settings;
-#line 1757 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp118_ = g_settings_get_int (_tmp117_, "text-dpi");
-#line 1757 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = _tmp118_;
-#line 1758 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp119_ = dpi;
-#line 1758 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp119_ <= 0) {
-#line 1759 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
 #line 8576 "ui.c"
 	}
-#line 1760 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp120_ = self->priv->text_dpi_combo;
-#line 1760 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp121_ = dpi;
-#line 1760 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_dpi_combo (self, _tmp120_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp121_);
-#line 1761 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp122_ = self->priv->text_dpi_combo;
-#line 1761 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp122_, "changed", (GCallback) ___lambda11__gtk_combo_box_changed, self, 0);
-#line 1762 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp123_ = self->priv->settings;
-#line 1762 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp124_ = g_settings_get_int (_tmp123_, "photo-dpi");
-#line 1762 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = _tmp124_;
-#line 1763 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp125_ = dpi;
-#line 1763 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp125_ <= 0) {
-#line 1764 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
 #line 8600 "ui.c"
 	}
-#line 1765 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp126_ = self->priv->photo_dpi_combo;
-#line 1765 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp127_ = dpi;
-#line 1765 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_dpi_combo (self, _tmp126_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp127_);
-#line 1766 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp128_ = self->priv->photo_dpi_combo;
-#line 1766 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp128_, "changed", (GCallback) ___lambda12__gtk_combo_box_changed, self, 0);
-#line 1768 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp129_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1768 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp129_);
-#line 1768 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp129_;
-#line 1769 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp130_ = self->priv->device_combo;
-#line 1769 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp131_ = renderer;
-#line 1769 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp130_, (GtkCellRenderer*) _tmp131_, TRUE);
-#line 1770 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp132_ = self->priv->device_combo;
-#line 1770 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp133_ = renderer;
-#line 1770 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp132_, (GtkCellRenderer*) _tmp133_, "text", 1);
-#line 1772 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp134_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1772 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp134_);
-#line 1772 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1772 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp134_;
-#line 1773 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp135_ = self->priv->page_side_combo;
-#line 1773 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp136_ = renderer;
-#line 1773 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp135_, (GtkCellRenderer*) _tmp136_, TRUE);
-#line 1774 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp137_ = self->priv->page_side_combo;
-#line 1774 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp138_ = renderer;
-#line 1774 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp137_, (GtkCellRenderer*) _tmp138_, "text", 1);
-#line 1775 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp139_ = self->priv->settings;
-#line 1775 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp140_ = g_settings_get_enum (_tmp139_, "page-side");
-#line 1775 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_page_side (self, (ScanType) _tmp140_);
-#line 1776 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp141_ = self->priv->page_side_combo;
-#line 1776 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp141_, "changed", (GCallback) ___lambda13__gtk_combo_box_changed, self, 0);
-#line 1778 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp142_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1778 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp142_);
-#line 1778 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1778 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp142_;
-#line 1779 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp143_ = self->priv->paper_size_combo;
-#line 1779 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp144_ = renderer;
-#line 1779 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp143_, (GtkCellRenderer*) _tmp144_, TRUE);
-#line 1780 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp145_ = self->priv->paper_size_combo;
-#line 1780 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp146_ = renderer;
-#line 1780 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp145_, (GtkCellRenderer*) _tmp146_, "text", 2);
-#line 1781 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp147_ = self->priv->settings;
-#line 1781 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp148_ = g_settings_get_int (_tmp147_, "paper-width");
-#line 1781 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	paper_width = _tmp148_;
-#line 1782 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp149_ = self->priv->settings;
-#line 1782 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp150_ = g_settings_get_int (_tmp149_, "paper-height");
-#line 1782 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	paper_height = _tmp150_;
-#line 1783 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp151_ = paper_width;
-#line 1783 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp152_ = paper_height;
-#line 1783 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_paper_size (self, _tmp151_, _tmp152_);
-#line 1784 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp153_ = self->priv->paper_size_combo;
-#line 1784 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp153_, "changed", (GCallback) ___lambda14__gtk_combo_box_changed, self, 0);
-#line 1792 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp154_ = self->priv->brightness_adjustment;
-#line 1792 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp155_ = gtk_adjustment_get_lower (_tmp154_);
-#line 1792 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp156_ = _tmp155_;
-#line 1792 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	lower = _tmp156_;
-#line 1793 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp157_ = _ ("Darker");
-#line 1793 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp158_ = g_strdup_printf ("<small>%s</small>", _tmp157_);
-#line 1793 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	darker_label = _tmp158_;
-#line 1794 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp159_ = self->priv->brightness_adjustment;
-#line 1794 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp160_ = gtk_adjustment_get_upper (_tmp159_);
-#line 1794 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp161_ = _tmp160_;
-#line 1794 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	upper = _tmp161_;
-#line 1795 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp162_ = _ ("Lighter");
-#line 1795 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp163_ = g_strdup_printf ("<small>%s</small>", _tmp162_);
-#line 1795 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	lighter_label = _tmp163_;
-#line 1796 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp164_ = self->priv->brightness_scale;
-#line 1796 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp165_ = lower;
-#line 1796 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp166_ = darker_label;
-#line 1796 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp164_, _tmp165_, GTK_POS_BOTTOM, _tmp166_);
-#line 1797 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp167_ = self->priv->brightness_scale;
-#line 1797 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp167_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
-#line 1798 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp168_ = self->priv->brightness_scale;
-#line 1798 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp169_ = upper;
-#line 1798 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp170_ = lighter_label;
-#line 1798 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp168_, _tmp169_, GTK_POS_BOTTOM, _tmp170_);
-#line 1799 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp171_ = self->priv->settings;
-#line 1799 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp172_ = g_settings_get_int (_tmp171_, "brightness");
-#line 1799 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_brightness (self, _tmp172_);
-#line 1800 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp173_ = self->priv->brightness_adjustment;
-#line 1800 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp173_, "value-changed", (GCallback) ___lambda15__gtk_adjustment_value_changed, self, 0);
-#line 1802 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp174_ = self->priv->contrast_adjustment;
-#line 1802 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp175_ = gtk_adjustment_get_lower (_tmp174_);
-#line 1802 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp176_ = _tmp175_;
-#line 1802 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	lower = _tmp176_;
-#line 1803 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp177_ = _ ("Less");
-#line 1803 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp178_ = g_strdup_printf ("<small>%s</small>", _tmp177_);
-#line 1803 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	less_label = _tmp178_;
-#line 1804 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp179_ = self->priv->contrast_adjustment;
-#line 1804 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp180_ = gtk_adjustment_get_upper (_tmp179_);
-#line 1804 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp181_ = _tmp180_;
-#line 1804 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	upper = _tmp181_;
-#line 1805 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp182_ = _ ("More");
-#line 1805 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp183_ = g_strdup_printf ("<small>%s</small>", _tmp182_);
-#line 1805 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	more_label = _tmp183_;
-#line 1806 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp184_ = self->priv->contrast_scale;
-#line 1806 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp185_ = lower;
-#line 1806 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp186_ = less_label;
-#line 1806 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp184_, _tmp185_, GTK_POS_BOTTOM, _tmp186_);
-#line 1807 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp187_ = self->priv->contrast_scale;
-#line 1807 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp187_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
-#line 1808 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp188_ = self->priv->contrast_scale;
-#line 1808 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp189_ = upper;
-#line 1808 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp190_ = more_label;
-#line 1808 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp188_, _tmp189_, GTK_POS_BOTTOM, _tmp190_);
-#line 1809 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp191_ = self->priv->settings;
-#line 1809 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp192_ = g_settings_get_int (_tmp191_, "contrast");
-#line 1809 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_contrast (self, _tmp192_);
-#line 1810 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp193_ = self->priv->contrast_adjustment;
-#line 1810 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp193_, "value-changed", (GCallback) ___lambda16__gtk_adjustment_value_changed, self, 0);
-#line 1812 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp194_ = self->priv->quality_adjustment;
-#line 1812 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp195_ = gtk_adjustment_get_lower (_tmp194_);
-#line 1812 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp196_ = _tmp195_;
-#line 1812 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	lower = _tmp196_;
-#line 1813 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp197_ = _ ("Minimum");
-#line 1813 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp198_ = g_strdup_printf ("<small>%s</small>", _tmp197_);
-#line 1813 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	minimum_label = _tmp198_;
-#line 1814 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp199_ = self->priv->quality_adjustment;
-#line 1814 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp200_ = gtk_adjustment_get_upper (_tmp199_);
-#line 1814 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp201_ = _tmp200_;
-#line 1814 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	upper = _tmp201_;
-#line 1815 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp202_ = _ ("Maximum");
-#line 1815 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp203_ = g_strdup_printf ("<small>%s</small>", _tmp202_);
-#line 1815 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	maximum_label = _tmp203_;
-#line 1816 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp204_ = self->priv->quality_scale;
-#line 1816 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp205_ = lower;
-#line 1816 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp206_ = minimum_label;
-#line 1816 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp204_, _tmp205_, GTK_POS_BOTTOM, _tmp206_);
-#line 1817 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp207_ = self->priv->quality_scale;
-#line 1817 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp207_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
-#line 1818 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp208_ = self->priv->quality_scale;
-#line 1818 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp209_ = upper;
-#line 1818 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp210_ = maximum_label;
-#line 1818 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_scale_add_mark (_tmp208_, _tmp209_, GTK_POS_BOTTOM, _tmp210_);
-#line 1819 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp211_ = self->priv->settings;
-#line 1819 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp212_ = g_settings_get_int (_tmp211_, "jpeg-quality");
-#line 1819 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_quality (self, _tmp212_);
-#line 1820 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp213_ = self->priv->quality_adjustment;
-#line 1820 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp213_, "value-changed", (GCallback) ___lambda17__gtk_adjustment_value_changed, self, 0);
-#line 1822 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp214_ = self->priv->settings;
-#line 1822 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp215_ = g_settings_get_string (_tmp214_, "selected-device");
-#line 1822 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	device = _tmp215_;
-#line 1823 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp216_ = device;
-#line 1823 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp216_ != NULL) {
 #line 8886 "ui.c"
 		const gchar* _tmp217_ = NULL;
 		GtkTreeIter _tmp218_ = {0};
 		gboolean _tmp219_ = FALSE;
-#line 1825 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp217_ = device;
-#line 1825 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp219_ = user_interface_find_scan_device (self, _tmp217_, &_tmp218_);
-#line 1825 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp218_;
-#line 1825 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp219_) {
 #line 8898 "ui.c"
 			GtkComboBox* _tmp220_ = NULL;
 			GtkTreeIter _tmp221_ = {0};
-#line 1826 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp220_ = self->priv->device_combo;
-#line 1826 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp221_ = iter;
-#line 1826 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_combo_box_set_active_iter (_tmp220_, &_tmp221_);
 #line 8907 "ui.c"
 		}
 	}
-#line 1829 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp222_ = self->priv->settings;
-#line 1829 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp223_ = g_settings_get_string (_tmp222_, "document-type");
-#line 1829 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	document_type = _tmp223_;
-#line 1830 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp224_ = document_type;
-#line 1830 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp224_ != NULL) {
 #line 8920 "ui.c"
 		const gchar* _tmp225_ = NULL;
-#line 1831 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp225_ = document_type;
-#line 1831 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, _tmp225_, FALSE);
 #line 8926 "ui.c"
 	}
-#line 1833 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp226_ = self->priv->_book;
-#line 1833 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp227_ = book_view_new (_tmp226_);
-#line 1833 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp227_);
-#line 1833 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->book_view);
-#line 1833 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_view = _tmp227_;
-#line 1834 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp228_ = self->priv->book_view;
-#line 1834 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_set_border_width ((GtkContainer*) _tmp228_, (guint) 18);
-#line 1835 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp229_ = self->priv->main_vbox;
-#line 1835 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp230_ = self->priv->book_view;
-#line 1835 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_end (_tmp229_, (GtkWidget*) _tmp230_, TRUE, TRUE, (guint) 0);
-#line 1836 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp231_ = self->priv->book_view;
-#line 1836 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp231_, "page-selected", (GCallback) _user_interface_page_selected_cb_book_view_page_selected, self, 0);
-#line 1837 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp232_ = self->priv->book_view;
-#line 1837 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp232_, "show-page", (GCallback) _user_interface_show_page_cb_book_view_show_page, self, 0);
-#line 1838 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp233_ = self->priv->book_view;
-#line 1838 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp233_, "show-menu", (GCallback) _user_interface_show_page_menu_cb_book_view_show_menu, self, 0);
-#line 1839 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp234_ = self->priv->book_view;
-#line 1839 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp234_, TRUE);
-#line 1841 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp235_ = self->priv->authorize_dialog;
-#line 1841 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for ((GtkWindow*) _tmp235_, (GtkWindow*) self);
-#line 1842 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp236_ = self->priv->preferences_dialog;
-#line 1842 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for ((GtkWindow*) _tmp236_, (GtkWindow*) self);
-#line 1845 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_load_state (self);
-#line 1848 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp237_ = self->priv->window_width;
-#line 1848 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp238_ = self->priv->window_height;
-#line 1848 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_debug ("ui.vala:1848: Restoring window to %dx%d pixels", _tmp237_, _tmp238_);
-#line 1849 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp239_ = self->priv->window_width;
-#line 1849 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp240_ = self->priv->window_height;
-#line 1849 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_default_size ((GtkWindow*) self, _tmp239_, _tmp240_);
-#line 1850 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp241_ = self->priv->window_is_maximized;
-#line 1850 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp241_) {
-#line 1852 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_debug ("ui.vala:1852: Restoring window to maximized");
-#line 1853 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_window_maximize ((GtkWindow*) self);
 #line 8994 "ui.c"
 	}
-#line 1856 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp242_ = _ ("Saving document...");
-#line 1856 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp243_ = progress_bar_dialog_new ((GtkApplicationWindow*) self, _tmp242_);
-#line 1856 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp243_);
-#line 1856 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 1856 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->progress_dialog = _tmp243_;
-#line 1857 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp244_ = self->priv->_book;
-#line 1857 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_connect_object (_tmp244_, "saving", (GCallback) _user_interface_book_saving_cb_book_saving, self, 0);
-#line 1662 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (document_type);
-#line 1662 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (device);
-#line 1662 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (maximum_label);
-#line 1662 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (minimum_label);
-#line 1662 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (more_label);
-#line 1662 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (less_label);
-#line 1662 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (lighter_label);
-#line 1662 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (darker_label);
-#line 1662 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1662 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (content_area);
-#line 1662 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
-#line 1662 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (app);
 #line 9034 "ui.c"
 }
@@ -9054,31 +9054,31 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam
 	const gchar* _tmp3_ = NULL;
 	gchar** _tmp4_ = NULL;
 	gchar** _tmp5_ = NULL;
-#line 1860 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1860 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (name != NULL, FALSE);
-#line 1862 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_getenv ("XDG_CURRENT_DESKTOP");
-#line 1862 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1862 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	desktop_name_list = _tmp1_;
-#line 1863 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = desktop_name_list;
-#line 1863 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_ == NULL) {
-#line 1864 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 1864 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (desktop_name_list);
-#line 1864 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
 #line 9067 "ui.c"
 	}
-#line 1866 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = desktop_name_list;
-#line 1866 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_ = g_strsplit (_tmp3_, ":", 0);
 #line 9073 "ui.c"
 	{
@@ -9086,55 +9086,55 @@ static gboolean user_interface_is_desktop (UserInterface* self, const gchar* nam
 		gint n_collection_length1 = 0;
 		gint _n_collection_size_ = 0;
 		gint n_it = 0;
-#line 1866 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		n_collection = _tmp5_;
-#line 1866 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		n_collection_length1 = _vala_array_length (_tmp4_);
-#line 1866 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (n_it = 0; n_it < _vala_array_length (_tmp4_); n_it = n_it + 1) {
 #line 9085 "ui.c"
 			gchar* _tmp6_ = NULL;
 			gchar* n = NULL;
-#line 1866 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp6_ = g_strdup (n_collection[n_it]);
-#line 1866 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			n = _tmp6_;
 #line 9092 "ui.c"
 			{
 				const gchar* _tmp7_ = NULL;
 				const gchar* _tmp8_ = NULL;
-#line 1867 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp7_ = n;
-#line 1867 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp8_ = name;
-#line 1867 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 1868 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					result = TRUE;
-#line 1868 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (n);
-#line 1868 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					n_collection = (_vala_array_free (n_collection, n_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 1868 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (desktop_name_list);
-#line 1868 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					return result;
 #line 9112 "ui.c"
 				}
-#line 1866 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (n);
 #line 9116 "ui.c"
 			}
 		}
-#line 1866 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		n_collection = (_vala_array_free (n_collection, n_collection_length1, (GDestroyNotify) g_free), NULL);
 #line 9121 "ui.c"
 	}
-#line 1870 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1870 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (desktop_name_list);
-#line 1870 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 9129 "ui.c"
 }
@@ -9164,29 +9164,29 @@ static void user_interface_load_state (UserInterface* self) {
 	gchar* _tmp26_ = NULL;
 	gchar* _tmp27_ = NULL;
 	GQuark _tmp29_ = 0U;
-#line 1902 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label0 = 0;
-#line 1902 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label1 = 0;
-#line 1902 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label2 = 0;
 #line 9163 "ui.c"
 	GError * _inner_error_ = NULL;
-#line 1878 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1880 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_get_state_filename (self);
-#line 1880 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_;
-#line 1880 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1880 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_debug ("ui.vala:1880: Loading state from %s", _tmp2_);
-#line 1880 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp2_);
-#line 1882 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_key_file_new ();
-#line 1882 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	f = _tmp3_;
 #line 9181 "ui.c"
 	{
@@ -9194,19 +9194,19 @@ static void user_interface_load_state (UserInterface* self) {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1885 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = f;
-#line 1885 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_state_filename (self);
-#line 1885 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 1885 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 1885 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_key_file_load_from_file (_tmp4_, _tmp7_, G_KEY_FILE_NONE, &_inner_error_);
-#line 1885 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp7_);
-#line 1885 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9201 "ui.c"
 			goto __catch21_g_error;
@@ -9217,159 +9217,159 @@ static void user_interface_load_state (UserInterface* self) {
 	{
 		GError* e = NULL;
 		GError* _tmp8_ = NULL;
-#line 1883 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1883 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1889 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = e;
-#line 1889 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!g_error_matches (_tmp8_, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
 #line 9218 "ui.c"
 			GError* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
-#line 1890 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = e;
-#line 1890 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = _tmp9_->message;
-#line 1890 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_warning ("ui.vala:1890: Failed to load state: %s", _tmp10_);
 #line 9227 "ui.c"
 		}
-#line 1883 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
 #line 9231 "ui.c"
 	}
 	__finally21:
-#line 1883 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1883 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_key_file_unref0 (f);
-#line 1883 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.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 1883 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1883 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 9244 "ui.c"
 	}
-#line 1892 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = f;
-#line 1892 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = user_interface_state_get_integer (self, _tmp11_, "window", "width", 600);
-#line 1892 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_width = _tmp12_;
-#line 1893 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->window_width;
-#line 1893 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp13_ <= 0) {
-#line 1894 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_width = 600;
 #line 9258 "ui.c"
 	}
-#line 1895 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = f;
-#line 1895 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = user_interface_state_get_integer (self, _tmp14_, "window", "height", 400);
-#line 1895 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_height = _tmp15_;
-#line 1896 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = self->priv->window_height;
-#line 1896 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp16_ <= 0) {
-#line 1897 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_height = 400;
 #line 9272 "ui.c"
 	}
-#line 1898 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = f;
-#line 1898 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = user_interface_state_get_boolean (self, _tmp17_, "window", "is-maximized", FALSE);
-#line 1898 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_is_maximized = _tmp18_;
-#line 1899 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = f;
-#line 1899 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = user_interface_state_get_integer (self, _tmp19_, "last-page", "width", 595);
-#line 1899 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_width = _tmp20_;
-#line 1900 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = f;
-#line 1900 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = user_interface_state_get_integer (self, _tmp21_, "last-page", "height", 842);
-#line 1900 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_height = _tmp22_;
-#line 1901 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = f;
-#line 1901 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = user_interface_state_get_integer (self, _tmp23_, "last-page", "dpi", 72);
-#line 1901 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_dpi = _tmp24_;
-#line 1902 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = f;
-#line 1902 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = user_interface_state_get_string (self, _tmp25_, "last-page", "scan-direction", "top-to-bottom");
-#line 1902 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = _tmp26_;
-#line 1902 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = (NULL == _tmp27_) ? 0 : g_quark_from_string (_tmp27_);
-#line 1902 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_free (_tmp27_);
-#line 1902 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp29_ == ((0 != _tmp28_label0) ? _tmp28_label0 : (_tmp28_label0 = g_quark_from_static_string ("bottom-to-top")))) {
-#line 1902 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
 #line 9312 "ui.c"
 			default:
 			{
-#line 1909 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 1910 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
 #line 9319 "ui.c"
 			}
 		}
 	} else if (_tmp29_ == ((0 != _tmp28_label1) ? _tmp28_label1 : (_tmp28_label1 = g_quark_from_static_string ("left-to-right")))) {
-#line 1902 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
 #line 9325 "ui.c"
 			default:
 			{
-#line 1912 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
-#line 1913 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
 #line 9332 "ui.c"
 			}
 		}
 	} else if (_tmp29_ == ((0 != _tmp28_label2) ? _tmp28_label2 : (_tmp28_label2 = g_quark_from_static_string ("right-to-left")))) {
-#line 1902 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
 #line 9338 "ui.c"
 			default:
 			{
-#line 1915 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1915 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
-#line 1916 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
 #line 9345 "ui.c"
 			}
 		}
 	} else {
-#line 1902 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1902 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
 #line 9351 "ui.c"
 			default:
 			{
-#line 1906 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 1907 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
 #line 9358 "ui.c"
 			}
 		}
 	}
-#line 1878 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_key_file_unref0 (f);
 #line 9364 "ui.c"
 }
@@ -9378,13 +9378,13 @@ static void user_interface_load_state (UserInterface* self) {
 static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gint _default_) {
 	gint result = 0;
 	GError * _inner_error_ = NULL;
-#line 1920 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1920 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, 0);
-#line 1920 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, 0);
-#line 1920 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, 0);
 #line 9379 "ui.c"
 	{
@@ -9393,24 +9393,24 @@ static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f,
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 1924 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 1924 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 1924 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 1924 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_integer (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 1924 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 1924 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9398 "ui.c"
 			goto __catch22_g_error;
 		}
-#line 1924 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp0_;
-#line 1924 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
 #line 9405 "ui.c"
 	}
@@ -9418,24 +9418,24 @@ static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f,
 	__catch22_g_error:
 	{
 		gint _tmp5_ = 0;
-#line 1922 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1922 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1928 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _default_;
-#line 1928 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 1928 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1928 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
 #line 9421 "ui.c"
 	}
 	__finally22:
-#line 1922 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.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 1922 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 1922 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return 0;
 #line 9430 "ui.c"
 }
@@ -9444,13 +9444,13 @@ static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f,
 static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gboolean _default_) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1932 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1932 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, FALSE);
-#line 1932 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, FALSE);
-#line 1932 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
 #line 9445 "ui.c"
 	{
@@ -9459,24 +9459,24 @@ static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile*
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 1936 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 1936 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 1936 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 1936 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_boolean (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 1936 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 1936 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9464 "ui.c"
 			goto __catch23_g_error;
 		}
-#line 1936 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp0_;
-#line 1936 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1936 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
 #line 9471 "ui.c"
 	}
@@ -9484,24 +9484,24 @@ static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile*
 	__catch23_g_error:
 	{
 		gboolean _tmp5_ = FALSE;
-#line 1934 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1934 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1940 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _default_;
-#line 1940 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 1940 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
 #line 9487 "ui.c"
 	}
 	__finally23:
-#line 1934 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.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 1934 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 1934 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return FALSE;
 #line 9496 "ui.c"
 }
@@ -9510,15 +9510,15 @@ static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile*
 static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, const gchar* _default_) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1944 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1944 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, NULL);
-#line 1944 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, NULL);
-#line 1944 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 1944 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (_default_ != NULL, NULL);
 #line 9513 "ui.c"
 	{
@@ -9528,30 +9528,30 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f,
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1948 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 1948 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 1948 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 1948 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_string (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 1948 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 1948 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9533 "ui.c"
 			goto __catch24_g_error;
 		}
-#line 1948 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp0_;
-#line 1948 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = NULL;
-#line 1948 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 1948 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp0_);
-#line 1948 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
 #line 9546 "ui.c"
 	}
@@ -9560,26 +9560,26 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f,
 	{
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1946 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1946 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1952 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _default_;
-#line 1952 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = g_strdup (_tmp6_);
-#line 1952 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp7_;
-#line 1952 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
 #line 9565 "ui.c"
 	}
 	__finally24:
-#line 1946 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.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 1946 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 1946 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return NULL;
 #line 9574 "ui.c"
 }
@@ -9587,13 +9587,13 @@ static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f,
 
 static gboolean ___lambda10_ (UserInterface* self) {
 	gboolean result = FALSE;
-#line 1964 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, TRUE);
-#line 1965 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_state_timeout = (guint) 0;
-#line 1966 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1966 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 9588 "ui.c"
 }
@@ -9602,7 +9602,7 @@ static gboolean ___lambda10_ (UserInterface* self) {
 static gboolean ____lambda10__gsource_func (gpointer self) {
 	gboolean result;
 	result = ___lambda10_ ((UserInterface*) self);
-#line 1962 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 9597 "ui.c"
 }
@@ -9629,143 +9629,143 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 	gint _tmp19_ = 0;
 	ScanDirection _tmp20_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1956 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1958 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = force;
-#line 1958 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp0_) {
 #line 9628 "ui.c"
 		guint _tmp1_ = 0U;
 		guint _tmp3_ = 0U;
-#line 1960 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = self->priv->save_state_timeout;
-#line 1960 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp1_ != ((guint) 0)) {
 #line 9635 "ui.c"
 			guint _tmp2_ = 0U;
-#line 1961 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp2_ = self->priv->save_state_timeout;
-#line 1961 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_source_remove (_tmp2_);
 #line 9641 "ui.c"
 		}
-#line 1962 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda10__gsource_func, g_object_ref (self), g_object_unref);
-#line 1962 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->save_state_timeout = _tmp3_;
-#line 1968 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 9649 "ui.c"
 	}
-#line 1971 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = user_interface_get_state_filename (self);
-#line 1971 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1971 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _tmp5_;
-#line 1971 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_debug ("ui.vala:1971: Saving state to %s", _tmp6_);
-#line 1971 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp6_);
-#line 1973 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = g_key_file_new ();
-#line 1973 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	f = _tmp7_;
-#line 1974 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = f;
-#line 1974 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->window_width;
-#line 1974 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp8_, "window", "width", _tmp9_);
-#line 1975 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = f;
-#line 1975 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->window_height;
-#line 1975 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp10_, "window", "height", _tmp11_);
-#line 1976 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = f;
-#line 1976 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->window_is_maximized;
-#line 1976 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_boolean (_tmp12_, "window", "is-maximized", _tmp13_);
-#line 1977 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = f;
-#line 1977 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->default_page_width;
-#line 1977 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp14_, "last-page", "width", _tmp15_);
-#line 1978 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = f;
-#line 1978 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->default_page_height;
-#line 1978 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp16_, "last-page", "height", _tmp17_);
-#line 1979 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = f;
-#line 1979 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = self->priv->default_page_dpi;
-#line 1979 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp18_, "last-page", "dpi", _tmp19_);
-#line 1980 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = self->priv->default_page_scan_direction;
-#line 1980 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (_tmp20_) {
-#line 1980 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
 #line 9707 "ui.c"
 		{
 			GKeyFile* _tmp21_ = NULL;
-#line 1983 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp21_ = f;
-#line 1983 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp21_, "last-page", "scan-direction", "top-to-bottom");
-#line 1984 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
 #line 9716 "ui.c"
 		}
-#line 1980 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
 #line 9720 "ui.c"
 		{
 			GKeyFile* _tmp22_ = NULL;
-#line 1986 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp22_ = f;
-#line 1986 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1986 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp22_, "last-page", "scan-direction", "bottom-to-top");
-#line 1987 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
 #line 9729 "ui.c"
 		}
-#line 1980 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
 #line 9733 "ui.c"
 		{
 			GKeyFile* _tmp23_ = NULL;
-#line 1989 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp23_ = f;
-#line 1989 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp23_, "last-page", "scan-direction", "left-to-right");
-#line 1990 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
 #line 9742 "ui.c"
 		}
-#line 1980 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
 #line 9746 "ui.c"
 		{
 			GKeyFile* _tmp24_ = NULL;
-#line 1992 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp24_ = f;
-#line 1992 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp24_, "last-page", "scan-direction", "right-to-left");
-#line 1993 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
 #line 9755 "ui.c"
 		}
 		default:
-#line 1980 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
 #line 9760 "ui.c"
 	}
@@ -9776,25 +9776,25 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 		GKeyFile* _tmp28_ = NULL;
 		gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
-#line 1997 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp25_ = user_interface_get_state_filename (self);
-#line 1997 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp26_ = _tmp25_;
-#line 1997 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp27_ = _tmp26_;
-#line 1997 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp28_ = f;
-#line 1997 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp29_ = g_key_file_to_data (_tmp28_, NULL, NULL);
-#line 1997 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp30_ = _tmp29_;
-#line 1997 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_file_set_contents (_tmp27_, _tmp30_, (gssize) (-1), &_inner_error_);
-#line 1997 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp30_);
-#line 1997 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp27_);
-#line 1997 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9789 "ui.c"
 			goto __catch25_g_error;
@@ -9806,34 +9806,34 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 		GError* e = NULL;
 		GError* _tmp31_ = NULL;
 		const gchar* _tmp32_ = NULL;
-#line 1995 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1995 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2001 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = e;
-#line 2001 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp32_ = _tmp31_->message;
-#line 2001 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_warning ("ui.vala:2001: Failed to write state: %s", _tmp32_);
-#line 1995 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
 #line 9811 "ui.c"
 	}
 	__finally25:
-#line 1995 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1995 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_key_file_unref0 (f);
-#line 1995 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.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 1995 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1995 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 9824 "ui.c"
 	}
-#line 1956 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_key_file_unref0 (f);
 #line 9828 "ui.c"
 }
@@ -9842,13 +9842,13 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 static gboolean ___lambda18_ (UserInterface* self) {
 	gboolean result = FALSE;
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2016 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2016 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
-#line 2017 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 2017 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 9843 "ui.c"
 }
@@ -9857,7 +9857,7 @@ static gboolean ___lambda18_ (UserInterface* self) {
 static gboolean ____lambda18__gsource_func (gpointer self) {
 	gboolean result;
 	result = ___lambda18_ ((UserInterface*) self);
-#line 2015 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 9852 "ui.c"
 }
@@ -9882,71 +9882,71 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number
 	ProgressBarDialog* _tmp12_ = NULL;
 	gdouble _tmp13_ = 0.0;
 	ProgressBarDialog* _tmp14_ = NULL;
-#line 2005 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2008 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
 #line 9879 "ui.c"
 		gboolean _tmp0_ = FALSE;
-#line 2008 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = gtk_events_pending ();
-#line 2008 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!_tmp0_) {
-#line 2008 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
 #line 9887 "ui.c"
 		}
-#line 2009 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_main_iteration ();
 #line 9891 "ui.c"
 	}
-#line 2011 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 2011 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 2011 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 2011 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	total = (gint) _tmp3_;
-#line 2012 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_number;
-#line 2012 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = total;
-#line 2012 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	fraction = (_tmp4_ + 1.0) / _tmp5_;
-#line 2013 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = fraction;
-#line 2013 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	complete = _tmp6_ == 1.0;
-#line 2014 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = complete;
-#line 2014 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_) {
-#line 2015 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda18__gsource_func, g_object_ref (self), g_object_unref);
 #line 9917 "ui.c"
 	}
-#line 2019 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("Saving page %d out of %d");
-#line 2019 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = page_number;
-#line 2019 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = total;
-#line 2019 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = g_strdup_printf (_tmp8_, _tmp9_ + 1, _tmp10_);
-#line 2019 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	message = _tmp11_;
-#line 2021 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = self->priv->progress_dialog;
-#line 2021 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = fraction;
-#line 2021 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_fraction (_tmp12_, _tmp13_);
-#line 2022 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = self->priv->progress_dialog;
-#line 2022 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_message (_tmp14_, message);
-#line 2005 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
 #line 9941 "ui.c"
 }
@@ -9954,11 +9954,11 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number
 
 void user_interface_show_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2025 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2027 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2027 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, TRUE);
 #line 9953 "ui.c"
 }
@@ -9966,11 +9966,11 @@ void user_interface_show_progress_dialog (UserInterface* self) {
 
 void user_interface_hide_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 2030 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2032 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 2032 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
 #line 9965 "ui.c"
 }
@@ -9982,44 +9982,44 @@ void user_interface_show_error (UserInterface* self, const gchar* error_title, c
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2035 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2035 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_title != NULL);
-#line 2035 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_text != NULL);
-#line 2037 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->have_error = TRUE;
-#line 2038 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = error_title;
-#line 2038 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2038 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_title);
-#line 2038 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_title = _tmp1_;
-#line 2039 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = error_text;
-#line 2039 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 2039 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_text);
-#line 2039 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_text = _tmp3_;
-#line 2040 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = change_scanner_hint;
-#line 2040 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_change_scanner_hint = _tmp4_;
-#line 2041 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2041 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
 #line 10005 "ui.c"
 }
 
 
 void user_interface_start (UserInterface* self) {
-#line 2044 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2046 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) self, TRUE);
 #line 10014 "ui.c"
 }
@@ -10028,20 +10028,20 @@ void user_interface_start (UserInterface* self) {
 Book* user_interface_get_book (UserInterface* self) {
 	Book* result;
 	Book* _tmp0_ = NULL;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp0_;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 10029 "ui.c"
 }
 
 
 static gpointer _book_ref0 (gpointer self) {
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? book_ref (self) : NULL;
 #line 10036 "ui.c"
 }
@@ -10050,17 +10050,17 @@ static gpointer _book_ref0 (gpointer self) {
 static void user_interface_set_book (UserInterface* self, Book* value) {
 	Book* _tmp0_ = NULL;
 	Book* _tmp1_ = NULL;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = value;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _book_ref0 (_tmp0_);
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_book_unref0 (self->priv->_book);
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->_book = _tmp1_;
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "book");
 #line 10055 "ui.c"
 }
@@ -10071,17 +10071,17 @@ Page* user_interface_get_selected_page (UserInterface* self) {
 	BookView* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
-#line 167 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp2_;
-#line 169 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 10076 "ui.c"
 }
@@ -10090,15 +10090,15 @@ Page* user_interface_get_selected_page (UserInterface* self) {
 void user_interface_set_selected_page (UserInterface* self, Page* value) {
 	BookView* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 171 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_view_set_selected_page (_tmp0_, _tmp1_);
-#line 171 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "selected-page");
 #line 10093 "ui.c"
 }
@@ -10107,13 +10107,13 @@ void user_interface_set_selected_page (UserInterface* self, Page* value) {
 const gchar* user_interface_get_default_file_name (UserInterface* self) {
 	const gchar* result;
 	const gchar* _tmp0_ = NULL;
-#line 188 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 188 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_default_file_name;
-#line 188 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp0_;
-#line 188 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 10108 "ui.c"
 }
@@ -10122,17 +10122,17 @@ const gchar* user_interface_get_default_file_name (UserInterface* self) {
 void user_interface_set_default_file_name (UserInterface* self, const gchar* value) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 188 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 188 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = value;
-#line 188 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 188 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->_default_file_name);
-#line 188 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->_default_file_name = _tmp1_;
-#line 188 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "default-file-name");
 #line 10127 "ui.c"
 }
@@ -10141,13 +10141,13 @@ void user_interface_set_default_file_name (UserInterface* self, const gchar* val
 gboolean user_interface_get_scanning (UserInterface* self) {
 	gboolean result;
 	gboolean _tmp0_ = FALSE;
-#line 192 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 192 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->scanning_;
-#line 192 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp0_;
-#line 192 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 10142 "ui.c"
 }
@@ -10165,43 +10165,43 @@ void user_interface_set_scanning (UserInterface* self, gboolean value) {
 	gboolean _tmp8_ = FALSE;
 	GtkButton* _tmp9_ = NULL;
 	gboolean _tmp10_ = FALSE;
-#line 193 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 195 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = value;
-#line 195 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->scanning_ = _tmp0_;
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->page_delete_menuitem;
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = value;
-#line 196 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp1_, !_tmp2_);
-#line 197 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->stop_scan_menuitem;
-#line 197 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = value;
-#line 197 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, _tmp4_);
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->stop_toolbutton;
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = value;
-#line 198 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp5_, _tmp6_);
-#line 199 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = self->priv->scan_button;
-#line 199 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = value;
-#line 199 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp7_, !_tmp8_);
-#line 200 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->stop_button;
-#line 200 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = value;
-#line 200 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp9_, _tmp10_);
-#line 193 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "scanning");
 #line 10196 "ui.c"
 }
@@ -10212,17 +10212,17 @@ gint user_interface_get_brightness (UserInterface* self) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->brightness_adjustment;
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = (gint) _tmp2_;
-#line 212 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 10217 "ui.c"
 }
@@ -10231,15 +10231,15 @@ gint user_interface_get_brightness (UserInterface* self) {
 void user_interface_set_brightness (UserInterface* self, gint value) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 213 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 213 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->brightness_adjustment;
-#line 213 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 213 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 213 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "brightness");
 #line 10234 "ui.c"
 }
@@ -10250,17 +10250,17 @@ gint user_interface_get_contrast (UserInterface* self) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->contrast_adjustment;
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = (gint) _tmp2_;
-#line 218 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 10255 "ui.c"
 }
@@ -10269,15 +10269,15 @@ gint user_interface_get_contrast (UserInterface* self) {
 void user_interface_set_contrast (UserInterface* self, gint value) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 219 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 219 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->contrast_adjustment;
-#line 219 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 219 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 219 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "contrast");
 #line 10272 "ui.c"
 }
@@ -10288,17 +10288,17 @@ gint user_interface_get_quality (UserInterface* self) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 224 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 224 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->quality_adjustment;
-#line 224 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 224 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 224 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = (gint) _tmp2_;
-#line 224 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 10293 "ui.c"
 }
@@ -10307,15 +10307,15 @@ gint user_interface_get_quality (UserInterface* self) {
 void user_interface_set_quality (UserInterface* self, gint value) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->quality_adjustment;
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 225 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "quality");
 #line 10310 "ui.c"
 }
@@ -10327,35 +10327,35 @@ gchar* user_interface_get_selected_device (UserInterface* self) {
 	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 230 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->device_combo;
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 234 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
 #line 10330 "ui.c"
 		gchar* device = NULL;
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->device_model;
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 237 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &device, -1, -1);
-#line 238 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = device;
-#line 238 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
 #line 10344 "ui.c"
 	}
-#line 241 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = NULL;
-#line 241 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 10350 "ui.c"
 }
@@ -10368,29 +10368,29 @@ void user_interface_set_selected_device (UserInterface* self, const gchar* value
 	gboolean _tmp2_ = FALSE;
 	GtkComboBox* _tmp3_ = NULL;
 	GtkTreeIter _tmp4_ = {0};
-#line 244 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = value;
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_find_scan_device (self, _tmp0_, &_tmp1_);
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 247 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 248 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
 #line 10373 "ui.c"
 	}
-#line 250 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->device_combo;
-#line 250 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = iter;
-#line 250 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_combo_box_set_active_iter (_tmp3_, &_tmp4_);
-#line 251 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->user_selected_device = TRUE;
-#line 244 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "selected-device");
 #line 10385 "ui.c"
 }
@@ -10400,15 +10400,15 @@ static gchar* user_interface_get_state_filename (UserInterface* self) {
 	gchar* result;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1875 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1875 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_get_user_cache_dir ();
-#line 1875 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_build_filename (_tmp0_, "simple-scan", "state", NULL);
-#line 1875 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp1_;
-#line 1875 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 10403 "ui.c"
 }
@@ -10421,25 +10421,25 @@ static void g_cclosure_user_marshal_VOID__STRING_SCAN_OPTIONS (GClosure * closur
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data1 = closure->data;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = param_values->data[0].v_pointer;
 #line 10422 "ui.c"
 	} else {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = closure->data;
 #line 10428 "ui.c"
 	}
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback = (GMarshalFunc_VOID__STRING_SCAN_OPTIONS) (marshal_data ? marshal_data : cc->callback);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback (data1, g_value_get_string (param_values + 1), value_get_scan_options (param_values + 2), data2);
 #line 10434 "ui.c"
 }
@@ -10452,25 +10452,25 @@ static void g_cclosure_user_marshal_VOID__STRING_INT (GClosure * closure, GValue
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data1 = closure->data;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = param_values->data[0].v_pointer;
 #line 10453 "ui.c"
 	} else {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = closure->data;
 #line 10459 "ui.c"
 	}
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback = (GMarshalFunc_VOID__STRING_INT) (marshal_data ? marshal_data : cc->callback);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_int (param_values + 2), data2);
 #line 10465 "ui.c"
 }
@@ -10478,225 +10478,225 @@ static void g_cclosure_user_marshal_VOID__STRING_INT (GClosure * closure, GValue
 
 static void user_interface_class_init (UserInterfaceClass * klass) {
 	gint UserInterface_private_offset;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_parent_class = g_type_class_peek_parent (klass);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (UserInterfacePrivate));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_user_interface_get_property;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_user_interface_set_property;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = user_interface_finalize;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_BOOK, param_spec_book ("book", "book", "book", TYPE_BOOK, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_SELECTED_PAGE, param_spec_page ("selected-page", "selected-page", "selected-page", TYPE_PAGE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_DEFAULT_FILE_NAME, g_param_spec_string ("default-file-name", "default-file-name", "default-file-name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_SCANNING, g_param_spec_boolean ("scanning", "scanning", "scanning", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_BRIGHTNESS, g_param_spec_int ("brightness", "brightness", "brightness", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_CONTRAST, g_param_spec_int ("contrast", "contrast", "contrast", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_QUALITY, g_param_spec_int ("quality", "quality", "quality", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_SELECTED_DEVICE, g_param_spec_string ("selected-device", "selected-device", "selected-device", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	UserInterface_private_offset = g_type_class_get_instance_private_offset (klass);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/SimpleScan/simple-scan.ui");
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_new ("start_scan", TYPE_USER_INTERFACE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_SCAN_OPTIONS, G_TYPE_NONE, 2, G_TYPE_STRING, TYPE_SCAN_OPTIONS);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_new ("stop_scan", TYPE_USER_INTERFACE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_new ("email", TYPE_USER_INTERFACE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_INT, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "menubar", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, menubar));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "toolbar", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, toolbar));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_menu", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_menu));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "main_vbox", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, main_vbox));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "custom_crop_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, custom_crop_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "a4_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, a4_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "a5_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, a5_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "a6_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, a6_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "letter_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, letter_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "legal_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, legal_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "four_by_six_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, four_by_six_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "no_crop_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, no_crop_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_move_left_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_move_left_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_move_right_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_move_right_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_delete_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_delete_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "crop_rotate_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, crop_rotate_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "save_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, save_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "save_as_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, save_as_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "copy_to_clipboard_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, copy_to_clipboard_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "save_button", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, save_button));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "save_toolbutton", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, save_toolbutton));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "stop_scan_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, stop_scan_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "stop_toolbutton", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, stop_toolbutton));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "crop_button", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, crop_button));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "crop_toolbutton", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, crop_toolbutton));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "stop_button", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, stop_button));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "scan_button", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, scan_button));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "text_button_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, text_button_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "text_button_hb_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, text_button_hb_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "text_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, text_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "photo_button_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, photo_button_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "photo_button_hb_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, photo_button_hb_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "photo_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, photo_menuitem));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "authorize_dialog", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, authorize_dialog));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "authorize_label", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, authorize_label));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "username_entry", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, username_entry));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "password_entry", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, password_entry));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "preferences_dialog", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, preferences_dialog));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "device_combo", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, device_combo));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "text_dpi_combo", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, text_dpi_combo));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "photo_dpi_combo", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, photo_dpi_combo));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_side_combo", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_side_combo));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "paper_size_combo", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, paper_size_combo));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "brightness_scale", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, brightness_scale));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "contrast_scale", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, contrast_scale));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "quality_scale", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, quality_scale));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "device_model", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, device_model));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "text_dpi_model", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, text_dpi_model));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "photo_dpi_model", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, photo_dpi_model));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_side_model", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_side_model));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "paper_size_model", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, paper_size_model));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "brightness_adjustment", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, brightness_adjustment));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "contrast_adjustment", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, contrast_adjustment));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "quality_adjustment", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, quality_adjustment));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "device_combo_changed_cb", G_CALLBACK(_user_interface_device_combo_changed_cb_gtk_combo_box_changed));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "new_button_clicked_cb", G_CALLBACK(_user_interface_new_button_clicked_cb_gtk_button_clicked));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "text_menuitem_toggled_cb", G_CALLBACK(_user_interface_text_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "photo_menuitem_toggled_cb", G_CALLBACK(_user_interface_photo_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "scan_button_clicked_cb", G_CALLBACK(_user_interface_scan_button_clicked_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "stop_scan_button_clicked_cb", G_CALLBACK(_user_interface_stop_scan_button_clicked_cb_gtk_button_clicked));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "continuous_scan_button_clicked_cb", G_CALLBACK(_user_interface_continuous_scan_button_clicked_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "preferences_button_clicked_cb", G_CALLBACK(_user_interface_preferences_button_clicked_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "preferences_dialog_delete_event_cb", G_CALLBACK(_user_interface_preferences_dialog_delete_event_cb_gtk_widget_delete_event));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "preferences_dialog_response_cb", G_CALLBACK(_user_interface_preferences_dialog_response_cb_gtk_dialog_response));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "rotate_left_button_clicked_cb", G_CALLBACK(_user_interface_rotate_left_button_clicked_cb_gtk_button_clicked));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "rotate_right_button_clicked_cb", G_CALLBACK(_user_interface_rotate_right_button_clicked_cb_gtk_button_clicked));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "no_crop_menuitem_toggled_cb", G_CALLBACK(_user_interface_no_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "custom_crop_menuitem_toggled_cb", G_CALLBACK(_user_interface_custom_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "crop_button_toggled_cb", G_CALLBACK(_user_interface_crop_button_toggled_cb_gtk_toggle_button_toggled));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "crop_toolbutton_toggled_cb", G_CALLBACK(_user_interface_crop_toolbutton_toggled_cb_gtk_toggle_tool_button_toggled));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "four_by_six_menuitem_toggled_cb", G_CALLBACK(_user_interface_four_by_six_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "legal_menuitem_toggled_cb", G_CALLBACK(_user_interface_legal_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "letter_menuitem_toggled_cb", G_CALLBACK(_user_interface_letter_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "a6_menuitem_toggled_cb", G_CALLBACK(_user_interface_a6_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "a5_menuitem_toggled_cb", G_CALLBACK(_user_interface_a5_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "a4_menuitem_toggled_cb", G_CALLBACK(_user_interface_a4_menuitem_toggled_cb_gtk_check_menu_item_toggled));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "crop_rotate_menuitem_activate_cb", G_CALLBACK(_user_interface_crop_rotate_menuitem_activate_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "page_move_left_menuitem_activate_cb", G_CALLBACK(_user_interface_page_move_left_menuitem_activate_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "page_move_right_menuitem_activate_cb", G_CALLBACK(_user_interface_page_move_right_menuitem_activate_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "page_delete_menuitem_activate_cb", G_CALLBACK(_user_interface_page_delete_menuitem_activate_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "reorder_menuitem_activate_cb", G_CALLBACK(_user_interface_reorder_menuitem_activate_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "save_file_button_clicked_cb", G_CALLBACK(_user_interface_save_file_button_clicked_cb_gtk_button_clicked));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "copy_to_clipboard_button_clicked_cb", G_CALLBACK(_user_interface_copy_to_clipboard_button_clicked_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "save_as_file_button_clicked_cb", G_CALLBACK(_user_interface_save_as_file_button_clicked_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "email_button_clicked_cb", G_CALLBACK(_user_interface_email_button_clicked_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "print_button_clicked_cb", G_CALLBACK(_user_interface_print_button_clicked_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "help_contents_menuitem_activate_cb", G_CALLBACK(_user_interface_help_contents_menuitem_activate_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "about_menuitem_activate_cb", G_CALLBACK(_user_interface_about_menuitem_activate_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "quit_menuitem_activate_cb", G_CALLBACK(_user_interface_quit_menuitem_activate_cb_gtk_menu_item_activate));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "simple_scan_window_configure_event_cb", G_CALLBACK(_user_interface_simple_scan_window_configure_event_cb_gtk_widget_configure_event));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "simple_scan_window_window_state_event_cb", G_CALLBACK(_user_interface_simple_scan_window_window_state_event_cb_gtk_widget_window_state_event));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "window_delete_event_cb", G_CALLBACK(_user_interface_window_delete_event_cb_gtk_widget_delete_event));
 #line 10691 "ui.c"
 }
@@ -10706,23 +10706,23 @@ static void user_interface_instance_init (UserInterface * self) {
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = USER_INTERFACE_GET_PRIVATE (self);
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_uri = NULL;
-#line 186 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("photo");
-#line 186 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->document_hint = _tmp0_;
-#line 188 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Scanned Document.pdf");
-#line 188 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 188 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->_default_file_name = _tmp2_;
-#line 189 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->scanning_ = FALSE;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_init_template (GTK_WIDGET (self));
 #line 10717 "ui.c"
 }
@@ -10736,167 +10736,167 @@ static void user_interface_finalize (GObject* obj) {
 	guint _tmp3_ = 0U;
 	Book* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_USER_INTERFACE, UserInterface);
-#line 286 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 286 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp1_, NULL, FALSE);
-#line 286 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _user_interface_page_added_cb_book_page_added, self);
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->_book;
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("reordered", TYPE_BOOK, &_tmp3_, NULL, FALSE);
-#line 287 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _user_interface_reordered_cb_book_reordered, self);
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->_book;
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp5_, NULL, FALSE);
-#line 288 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _user_interface_page_removed_cb_book_page_removed, self);
-#line 33 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 33 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->settings);
-#line 36 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 36 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->menubar);
-#line 38 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 38 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->toolbar);
-#line 40 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_menu);
-#line 42 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->main_vbox);
-#line 43 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar);
-#line 44 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_image);
-#line 45 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_label);
-#line 46 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 46 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_close_button);
-#line 47 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
-#line 49 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->custom_crop_menuitem);
-#line 51 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->a4_menuitem);
-#line 53 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 53 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->a5_menuitem);
-#line 55 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 55 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->a6_menuitem);
-#line 57 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->letter_menuitem);
-#line 59 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->legal_menuitem);
-#line 61 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->four_by_six_menuitem);
-#line 63 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->no_crop_menuitem);
-#line 65 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_move_left_menuitem);
-#line 67 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_move_right_menuitem);
-#line 69 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_delete_menuitem);
-#line 71 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->crop_rotate_menuitem);
-#line 73 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_menuitem);
-#line 75 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_as_menuitem);
-#line 77 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->copy_to_clipboard_menuitem);
-#line 79 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_button);
-#line 81 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_toolbutton);
-#line 83 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->stop_scan_menuitem);
-#line 85 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->stop_toolbutton);
-#line 87 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->crop_button);
-#line 89 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->crop_toolbutton);
-#line 91 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->stop_button);
-#line 93 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->scan_button);
-#line 96 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_button_menuitem);
-#line 98 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_button_hb_menuitem);
-#line 100 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_menuitem);
-#line 102 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_button_menuitem);
-#line 104 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_button_hb_menuitem);
-#line 106 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_menuitem);
-#line 109 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->authorize_dialog);
-#line 111 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->authorize_label);
-#line 113 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->username_entry);
-#line 115 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->password_entry);
-#line 118 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->preferences_dialog);
-#line 120 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->device_combo);
-#line 122 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_dpi_combo);
-#line 124 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_dpi_combo);
-#line 126 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_side_combo);
-#line 128 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->paper_size_combo);
-#line 130 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->brightness_scale);
-#line 132 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->contrast_scale);
-#line 134 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->quality_scale);
-#line 136 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->device_model);
-#line 138 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_dpi_model);
-#line 140 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_dpi_model);
-#line 142 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_side_model);
-#line 144 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->paper_size_model);
-#line 146 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->brightness_adjustment);
-#line 148 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->contrast_adjustment);
-#line 150 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->quality_adjustment);
-#line 154 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_dialog);
-#line 155 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 158 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_title);
-#line 159 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_text);
-#line 162 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_book_unref0 (self->priv->_book);
-#line 163 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-#line 177 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_autosave_manager_unref0 (self->priv->autosave_manager);
-#line 179 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->book_view);
-#line 186 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->document_hint);
-#line 188 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->_default_file_name);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (user_interface_parent_class)->finalize (obj);
 #line 10891 "ui.c"
 }
@@ -10917,61 +10917,61 @@ GType user_interface_get_type (void) {
 static void _vala_user_interface_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
 	UserInterface * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_USER_INTERFACE, UserInterface);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (property_id) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_BOOK:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		value_set_book (value, user_interface_get_book (self));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_SELECTED_PAGE:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		value_set_page (value, user_interface_get_selected_page (self));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_DEFAULT_FILE_NAME:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_string (value, user_interface_get_default_file_name (self));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_SCANNING:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_boolean (value, user_interface_get_scanning (self));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_BRIGHTNESS:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_int (value, user_interface_get_brightness (self));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_CONTRAST:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_int (value, user_interface_get_contrast (self));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_QUALITY:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_int (value, user_interface_get_quality (self));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_SELECTED_DEVICE:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_take_string (value, user_interface_get_selected_device (self));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
 #line 10960 "ui.c"
 		default:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
 #line 10966 "ui.c"
 	}
@@ -10981,61 +10981,61 @@ static void _vala_user_interface_get_property (GObject * object, guint property_
 static void _vala_user_interface_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
 	UserInterface * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_USER_INTERFACE, UserInterface);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (property_id) {
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_BOOK:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_book (self, value_get_book (value));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_SELECTED_PAGE:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_selected_page (self, value_get_page (value));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_DEFAULT_FILE_NAME:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_default_file_name (self, g_value_get_string (value));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_SCANNING:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_scanning (self, g_value_get_boolean (value));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_BRIGHTNESS:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_brightness (self, g_value_get_int (value));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_CONTRAST:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_contrast (self, g_value_get_int (value));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_QUALITY:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_quality (self, g_value_get_int (value));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case USER_INTERFACE_SELECTED_DEVICE:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_selected_device (self, g_value_get_string (value));
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
 #line 11024 "ui.c"
 		default:
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 14 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
 #line 11030 "ui.c"
 	}
@@ -11056,90 +11056,90 @@ ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkApplicat
 	const gchar* _tmp7_ = NULL;
 	GtkApplicationWindow* _tmp8_ = NULL;
 	GtkProgressBar* _tmp9_ = NULL;
-#line 2066 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (parent != NULL, NULL);
-#line 2066 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 2066 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (ProgressBarDialog*) g_object_new (object_type, NULL);
-#line 2068 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 2068 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 2068 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
-#line 2068 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->bar = _tmp0_;
-#line 2069 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-#line 2069 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
-#line 2069 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	hbox = _tmp1_;
-#line 2070 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-#line 2070 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp2_);
-#line 2070 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	vbox = _tmp2_;
-#line 2071 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_hexpand ((GtkWidget*) hbox, TRUE);
-#line 2073 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->bar;
-#line 2073 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp3_, "");
-#line 2074 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->bar;
-#line 2074 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_show_text (_tmp4_, TRUE);
-#line 2075 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->bar;
-#line 2075 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) _tmp5_, 225, 25);
-#line 2076 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) self, 250, 50);
-#line 2078 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->bar;
-#line 2078 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) _tmp6_, TRUE, FALSE, (guint) 0);
-#line 2079 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (hbox, (GtkWidget*) vbox, TRUE, FALSE, (guint) 0);
-#line 2080 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2080 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) self, (GtkWidget*) hbox);
-#line 2081 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = title;
-#line 2081 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_title ((GtkWindow*) self, _tmp7_);
-#line 2083 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = parent;
-#line 2083 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for ((GtkWindow*) self, (GtkWindow*) _tmp8_);
-#line 2084 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_position ((GtkWindow*) self, GTK_WIN_POS_CENTER_ON_PARENT);
-#line 2085 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_modal ((GtkWindow*) self, TRUE);
-#line 2086 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_resizable ((GtkWindow*) self, FALSE);
-#line 2088 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) hbox, TRUE);
-#line 2089 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2089 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) vbox, TRUE);
-#line 2090 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->bar;
-#line 2090 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp9_, TRUE);
-#line 2066 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (vbox);
-#line 2066 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
-#line 2066 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
 #line 11127 "ui.c"
 }
 
 
 ProgressBarDialog* progress_bar_dialog_new (GtkApplicationWindow* parent, const gchar* title) {
-#line 2066 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return progress_bar_dialog_construct (TYPE_PROGRESS_BAR_DIALOG, parent, title);
 #line 11134 "ui.c"
 }
@@ -11150,17 +11150,17 @@ gdouble progress_bar_dialog_get_fraction (ProgressBarDialog* self) {
 	GtkProgressBar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 2056 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0.0);
-#line 2056 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2056 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_progress_bar_get_fraction (_tmp0_);
-#line 2056 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2056 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp2_;
-#line 2056 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 11155 "ui.c"
 }
@@ -11169,15 +11169,15 @@ gdouble progress_bar_dialog_get_fraction (ProgressBarDialog* self) {
 void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble value) {
 	GtkProgressBar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 2057 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2057 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2057 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 2057 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
-#line 2057 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "fraction");
 #line 11172 "ui.c"
 }
@@ -11188,17 +11188,17 @@ const gchar* progress_bar_dialog_get_message (ProgressBarDialog* self) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 2062 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 2062 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2062 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_progress_bar_get_text (_tmp0_);
-#line 2062 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 2062 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp2_;
-#line 2062 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 11193 "ui.c"
 }
@@ -11207,41 +11207,41 @@ const gchar* progress_bar_dialog_get_message (ProgressBarDialog* self) {
 void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* value) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 2063 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 2063 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 2063 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 2063 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 2063 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_notify ((GObject *) self, "message");
 #line 11210 "ui.c"
 }
 
 
 static void progress_bar_dialog_class_init (ProgressBarDialogClass * klass) {
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (ProgressBarDialogPrivate));
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_progress_bar_dialog_get_property;
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_progress_bar_dialog_set_property;
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = progress_bar_dialog_finalize;
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), PROGRESS_BAR_DIALOG_FRACTION, g_param_spec_double ("fraction", "fraction", "fraction", -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), PROGRESS_BAR_DIALOG_MESSAGE, g_param_spec_string ("message", "message", "message", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
 #line 11229 "ui.c"
 }
 
 
 static void progress_bar_dialog_instance_init (ProgressBarDialog * self) {
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = PROGRESS_BAR_DIALOG_GET_PRIVATE (self);
 #line 11236 "ui.c"
 }
@@ -11249,11 +11249,11 @@ static void progress_bar_dialog_instance_init (ProgressBarDialog * self) {
 
 static void progress_bar_dialog_finalize (GObject* obj) {
 	ProgressBarDialog * self;
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
-#line 2052 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (progress_bar_dialog_parent_class)->finalize (obj);
 #line 11248 "ui.c"
 }
@@ -11274,25 +11274,25 @@ GType progress_bar_dialog_get_type (void) {
 static void _vala_progress_bar_dialog_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
 	ProgressBarDialog * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (property_id) {
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_FRACTION:
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_double (value, progress_bar_dialog_get_fraction (self));
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_MESSAGE:
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_value_set_string (value, progress_bar_dialog_get_message (self));
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
 #line 11281 "ui.c"
 		default:
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
 #line 11287 "ui.c"
 	}
@@ -11302,25 +11302,25 @@ static void _vala_progress_bar_dialog_get_property (GObject * object, guint prop
 static void _vala_progress_bar_dialog_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
 	ProgressBarDialog * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (property_id) {
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_FRACTION:
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		progress_bar_dialog_set_fraction (self, g_value_get_double (value));
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case PROGRESS_BAR_DIALOG_MESSAGE:
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		progress_bar_dialog_set_message (self, g_value_get_string (value));
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
 #line 11309 "ui.c"
 		default:
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 2050 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
 #line 11315 "ui.c"
 	}
@@ -11335,17 +11335,17 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
 	gchar* _tmp2_ = NULL;
 	gchar* path = NULL;
 	GError * _inner_error_ = NULL;
-#line 2095 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (prefix != NULL, NULL);
-#line 2095 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2095 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (extension != NULL, NULL);
-#line 2100 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = prefix;
-#line 2100 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = extension;
-#line 2100 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
-#line 2100 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp2_;
 #line 11340 "ui.c"
 	{
@@ -11354,24 +11354,24 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
 		gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 2104 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = filename;
-#line 2104 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_file_open_tmp (_tmp3_, &_tmp4_, &_inner_error_);
-#line 2104 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2104 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		path = _tmp4_;
-#line 2104 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		fd = _tmp5_;
-#line 2104 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 11359 "ui.c"
 			goto __catch26_g_error;
 		}
-#line 2105 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = fd;
-#line 2105 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		close (_tmp6_);
 #line 11366 "ui.c"
 	}
@@ -11381,48 +11381,48 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
 		GError* e = NULL;
 		GError* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
-#line 2102 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 2102 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 2109 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = e;
-#line 2109 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_->message;
-#line 2109 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_warning ("ui.vala:2109: Error saving email attachment: %s", _tmp8_);
-#line 2110 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = NULL;
-#line 2110 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 2110 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2110 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 2110 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
 #line 11394 "ui.c"
 	}
 	__finally26:
-#line 2102 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2102 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 2102 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 2102 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.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 2102 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 2102 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return NULL;
 #line 11409 "ui.c"
 	}
-#line 2113 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = path;
-#line 2113 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 2113 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 11417 "ui.c"
 }
@@ -11435,38 +11435,38 @@ PageIcon* page_icon_construct (GType object_type, const gchar* text, gdouble r,
 	gdouble _tmp2_ = 0.0;
 	gdouble _tmp3_ = 0.0;
 	gdouble _tmp4_ = 0.0;
-#line 2124 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (text != NULL, NULL);
-#line 2124 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) g_object_new (object_type, NULL);
-#line 2126 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = text;
-#line 2126 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2126 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->text);
-#line 2126 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->text = _tmp1_;
-#line 2127 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = r;
-#line 2127 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->r = _tmp2_;
-#line 2128 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g;
-#line 2128 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->g = _tmp3_;
-#line 2129 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = b;
-#line 2129 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2129 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->b = _tmp4_;
-#line 2124 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
 #line 11454 "ui.c"
 }
 
 
 PageIcon* page_icon_new (const gchar* text, gdouble r, gdouble g, gdouble b) {
-#line 2124 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return page_icon_construct (TYPE_PAGE_ICON, text, r, g, b);
 #line 11461 "ui.c"
 }
@@ -11476,21 +11476,21 @@ static void page_icon_real_get_preferred_width (GtkWidget* base, gint* minimum_w
 	PageIcon * self;
 	gint _vala_minimum_width = 0;
 	gint _vala_natural_width = 0;
-#line 2132 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2134 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_width = PAGE_ICON_MINIMUM_WIDTH;
-#line 2134 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_width = _vala_natural_width;
-#line 2132 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_width) {
-#line 2132 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_width = _vala_minimum_width;
 #line 11479 "ui.c"
 	}
-#line 2132 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_width) {
-#line 2132 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_width = _vala_natural_width;
 #line 11485 "ui.c"
 	}
@@ -11502,23 +11502,23 @@ static void page_icon_real_get_preferred_height (GtkWidget* base, gint* minimum_
 	gint _vala_minimum_height = 0;
 	gint _vala_natural_height = 0;
 	gdouble _tmp0_ = 0.0;
-#line 2137 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2139 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = round (PAGE_ICON_MINIMUM_WIDTH * G_SQRT2);
-#line 2139 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_height = (gint) _tmp0_;
-#line 2139 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2139 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_height = _vala_natural_height;
-#line 2137 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_height) {
-#line 2137 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_height = _vala_minimum_height;
 #line 11507 "ui.c"
 	}
-#line 2137 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_height) {
-#line 2137 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_height = _vala_natural_height;
 #line 11513 "ui.c"
 	}
@@ -11530,23 +11530,23 @@ static void page_icon_real_get_preferred_height_for_width (GtkWidget* base, gint
 	gint _vala_minimum_height = 0;
 	gint _vala_natural_height = 0;
 	gint _tmp0_ = 0;
-#line 2142 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2144 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = width;
-#line 2144 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_height = (gint) (_tmp0_ * G_SQRT2);
-#line 2144 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_height = _vala_natural_height;
-#line 2142 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_height) {
-#line 2142 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_height = _vala_minimum_height;
 #line 11535 "ui.c"
 	}
-#line 2142 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_height) {
-#line 2142 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_height = _vala_natural_height;
 #line 11541 "ui.c"
 	}
@@ -11558,23 +11558,23 @@ static void page_icon_real_get_preferred_width_for_height (GtkWidget* base, gint
 	gint _vala_minimum_width = 0;
 	gint _vala_natural_width = 0;
 	gint _tmp0_ = 0;
-#line 2147 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2149 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = height;
-#line 2149 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_natural_width = (gint) (_tmp0_ / G_SQRT2);
-#line 2149 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_minimum_width = _vala_natural_width;
-#line 2147 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (minimum_width) {
-#line 2147 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*minimum_width = _vala_minimum_width;
 #line 11563 "ui.c"
 	}
-#line 2147 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (natural_width) {
-#line 2147 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*natural_width = _vala_natural_width;
 #line 11569 "ui.c"
 	}
@@ -11619,152 +11619,152 @@ static gboolean page_icon_real_draw (GtkWidget* base, cairo_t* c) {
 	gdouble _tmp33_ = 0.0;
 	cairo_t* _tmp34_ = NULL;
 	const gchar* _tmp35_ = NULL;
-#line 2152 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (PageIcon*) base;
-#line 2152 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (c != NULL, FALSE);
-#line 2154 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
-#line 2154 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	w = _tmp0_;
-#line 2155 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
-#line 2155 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	h = _tmp1_;
-#line 2156 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = w;
-#line 2156 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = h;
-#line 2156 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((_tmp2_ * G_SQRT2) > ((gdouble) _tmp3_)) {
 #line 11630 "ui.c"
 		gint _tmp4_ = 0;
 		gdouble _tmp5_ = 0.0;
-#line 2157 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = h;
-#line 2157 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = round (_tmp4_ / G_SQRT2);
-#line 2157 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		w = (gint) _tmp5_;
 #line 11639 "ui.c"
 	} else {
 		gint _tmp6_ = 0;
 		gdouble _tmp7_ = 0.0;
-#line 2159 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = w;
-#line 2159 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = round (_tmp6_ * G_SQRT2);
-#line 2159 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		h = (gint) _tmp7_;
 #line 11649 "ui.c"
 	}
-#line 2161 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = c;
-#line 2161 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
-#line 2161 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = w;
-#line 2161 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
-#line 2161 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = h;
-#line 2161 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_translate (_tmp8_, (gdouble) ((_tmp9_ - _tmp10_) / 2), (gdouble) ((_tmp11_ - _tmp12_) / 2));
-#line 2163 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = c;
-#line 2163 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = w;
-#line 2163 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = h;
-#line 2163 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_rectangle (_tmp13_, 0.5, 0.5, (gdouble) (_tmp14_ - 1), (gdouble) (_tmp15_ - 1));
-#line 2165 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = c;
-#line 2165 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->r;
-#line 2165 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = self->priv->g;
-#line 2165 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = self->priv->b;
-#line 2165 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_source_rgb (_tmp16_, _tmp17_, _tmp18_, _tmp19_);
-#line 2166 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = c;
-#line 2166 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_fill_preserve (_tmp20_);
-#line 2168 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = c;
-#line 2168 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_line_width (_tmp21_, 1.0);
-#line 2169 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = c;
-#line 2169 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_set_source_rgb (_tmp22_, 0.0, 0.0, 0.0);
-#line 2170 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = c;
-#line 2170 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2170 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_stroke (_tmp23_);
-#line 2173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = c;
-#line 2173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = self->priv->text;
-#line 2173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_text_extents (_tmp24_, _tmp25_, &_tmp26_);
-#line 2173 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extents = _tmp26_;
-#line 2174 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = c;
-#line 2174 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = w;
-#line 2174 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = extents;
-#line 2174 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = _tmp29_.width;
-#line 2174 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = h;
-#line 2174 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = extents;
-#line 2174 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp33_ = _tmp32_.height;
-#line 2174 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_translate (_tmp27_, ((_tmp28_ - _tmp30_) * 0.5) - 0.5, ((_tmp31_ + _tmp33_) * 0.5) - 0.5);
-#line 2175 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp34_ = c;
-#line 2175 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp35_ = self->priv->text;
-#line 2175 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_show_text (_tmp34_, _tmp35_);
-#line 2177 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 2177 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
 #line 11731 "ui.c"
 }
 
 
 static void page_icon_class_init (PageIconClass * klass) {
-#line 2116 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_icon_parent_class = g_type_class_peek_parent (klass);
-#line 2116 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (PageIconPrivate));
-#line 2116 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_width = page_icon_real_get_preferred_width;
-#line 2116 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_height = page_icon_real_get_preferred_height;
-#line 2116 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_height_for_width = page_icon_real_get_preferred_height_for_width;
-#line 2116 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->get_preferred_width_for_height = page_icon_real_get_preferred_width_for_height;
-#line 2116 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	((GtkWidgetClass *) klass)->draw = page_icon_real_draw;
-#line 2116 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_icon_finalize;
 #line 11752 "ui.c"
 }
 
 
 static void page_icon_instance_init (PageIcon * self) {
-#line 2116 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = PAGE_ICON_GET_PRIVATE (self);
 #line 11759 "ui.c"
 }
@@ -11772,11 +11772,11 @@ static void page_icon_instance_init (PageIcon * self) {
 
 static void page_icon_finalize (GObject* obj) {
 	PageIcon * self;
-#line 2116 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_ICON, PageIcon);
-#line 2118 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->text);
-#line 2116 "/home/bob/bzr/simple-scan/3.16/src/ui.vala"
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (page_icon_parent_class)->finalize (obj);
 #line 11771 "ui.c"
 }