Merge tag 'upstream/3.17.3'

Upstream version 3.17.3
author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2015-06-28 12:27:50 +0200
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2015-06-28 12:27:50 +0200
commit: 84bcd0b97df992d9e633cf3c3b9382f202e4f754 (patch)
tree: 8bae1f453a0723e74b7f6b6e349775475ba730e1
parent: 21b9155ede6470d02c0aa026131532092e2db8d0 (diff)
parent: c2b991e03eeccb2c87efb12455bb674caa083f15 (diff)
94 files changed, 2511 insertions, 2464 deletions
diff --git a/Makefile.am b/Makefile.am
index 3bb2654..c507178 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = src data help po
 
+ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS}
+
 EXTRA_DIST = \
 	README.md \
 	autogen.sh \
diff --git a/Makefile.in b/Makefile.in
index 3d6abbf..60b0593 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,9 +78,12 @@ 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__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/yelp.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -204,7 +207,6 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -311,6 +313,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = src data help po
+ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS}
 EXTRA_DIST = \
 	README.md \
 	autogen.sh \
diff --git a/NEWS b/NEWS
index dd8067c..aa79def 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Overview of changes in simple-scan 3.17.3
+
+  * Stop using gnome-common, use autotools directly
+
 Overview of changes in simple-scan 3.17.2
 
   * Updated translations
diff --git a/aclocal.m4 b/aclocal.m4
index f6bbb9e..8fa2a48 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -20,795 +20,6 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# gnome-common.m4
-#
-# serial 3
-# 
-
-dnl GNOME_COMMON_INIT
-
-AU_DEFUN([GNOME_COMMON_INIT],
-[
-  dnl this macro should come after AC_CONFIG_MACRO_DIR
-  AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
-
-  dnl ensure that when the Automake generated makefile calls aclocal,
-  dnl it honours the $ACLOCAL_FLAGS environment variable
-  ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
-  if test -n "$ac_macro_dir"; then
-    ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
-  fi
-
-  AC_SUBST([ACLOCAL_AMFLAGS])
-],
-[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}"
-in your top-level Makefile.am, instead, where "m4" is the macro directory set
-with AC_CONFIG_MACRO_DIR() in your configure.ac]])
-
-AU_DEFUN([GNOME_DEBUG_CHECK],
-[
-	AX_CHECK_ENABLE_DEBUG([no],[GNOME_ENABLE_DEBUG])
-],
-[[$0: This macro is deprecated. You should use AX_CHECK_ENABLE_DEBUG instead and
-replace uses of GNOME_ENABLE_DEBUG with ENABLE_DEBUG.
-See: http://www.gnu.org/software/autoconf-archive/ax_check_enable_debug.html#ax_check_enable_debug]])
-
-dnl GNOME_MAINTAINER_MODE_DEFINES ()
-dnl define DISABLE_DEPRECATED
-dnl
-AU_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
-[
-	AC_REQUIRE([AM_MAINTAINER_MODE])
-
-	DISABLE_DEPRECATED=""
-	if test $USE_MAINTAINER_MODE = yes; then
-	        DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP"
-	        for DOMAIN in $DOMAINS; do
-	               DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
-	        done
-	fi
-
-	AC_SUBST(DISABLE_DEPRECATED)
-],
-[[$0: This macro is deprecated. All of the modules it disables deprecations for
-are obsolete. Remove it and all uses of DISABLE_DEPRECATED.]])
-
-dnl GLIB_GSETTINGS
-dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
-dnl the schema should be compiled
-dnl
-
-AC_DEFUN([GLIB_GSETTINGS],
-[
-  m4_pattern_allow([AM_V_GEN])
-  AC_ARG_ENABLE(schemas-compile,
-                AS_HELP_STRING([--disable-schemas-compile],
-                               [Disable regeneration of gschemas.compiled on install]),
-                [case ${enableval} in
-                  yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
-                  no)  GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
-                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
-                 esac])
-  AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
-  PKG_PROG_PKG_CONFIG([0.16])
-  AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
-  if test x$cross_compiling != xyes; then
-    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
-  else
-    AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
-  fi
-  AC_SUBST(GLIB_COMPILE_SCHEMAS)
-  if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
-    ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
-  else
-    ifelse([$1],,[:],[$1])
-  fi
-
-  GSETTINGS_RULES='
-.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
-
-mostlyclean-am: clean-gsettings-schemas
-
-gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
-
-%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
-	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@
-
-all-am: $(gsettings_SCHEMAS:.xml=.valid)
-uninstall-am: uninstall-gsettings-schemas
-install-data-am: install-gsettings-schemas
-
-.SECONDARY: $(gsettings_SCHEMAS)
-
-install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
-	@$(NORMAL_INSTALL)
-	if test -n "$^"; then \
-		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
-		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
-		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
-	fi
-
-uninstall-gsettings-schemas:
-	@$(NORMAL_UNINSTALL)
-	@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
-	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
-
-clean-gsettings-schemas:
-	rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
-
-ifdef gsettings_ENUM_NAMESPACE
-$(gsettings__enum_file): $(gsettings_ENUM_FILES)
-	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
-endif
-'
-  _GSETTINGS_SUBST(GSETTINGS_RULES)
-])
-
-dnl _GSETTINGS_SUBST(VARIABLE)
-dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-AC_DEFUN([_GSETTINGS_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 42 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL], [
-AC_PREREQ([2.50])dnl
-AC_REQUIRE([AM_NLS])dnl
-
-case "$am__api_version" in
-    1.[01234])
-	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-    ;;
-    *)
-    ;;
-esac
-
-INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-if test -n "$1"; then
-    AC_MSG_CHECKING([for intltool >= $1])
-    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
-fi
-
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-fi
-
-if test -z "$AM_DEFAULT_VERBOSITY"; then
-  AM_DEFAULT_VERBOSITY=1
-fi
-AC_SUBST([AM_DEFAULT_VERBOSITY])
-
-INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
-INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
-INTLTOOL__v_MERGE_0='@echo "  ITMRG " [$]@;'
-AC_SUBST(INTLTOOL_V_MERGE)
-AC_SUBST(INTLTOOL__v_MERGE_)
-AC_SUBST(INTLTOOL__v_MERGE_0)
-
-INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
-intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
-intltool__v_merge_options_0='-q'
-AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
-AC_SUBST(intltool__v_merge_options_)
-AC_SUBST(intltool__v_merge_options_0)
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
-else
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
-fi
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
-
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
-   AC_MSG_ERROR([perl not found])
-fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-else
-   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
-   AC_MSG_RESULT([$IT_PERL_VERSION])
-fi
-if test "x$2" != "xno-xml"; then
-   AC_MSG_CHECKING([for XML::Parser])
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       AC_MSG_RESULT([ok])
-   else
-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-IT_PO_SUBDIR([po])
-
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be executed at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
-  AC_CONFIG_COMMANDS([$1/stamp-it], [
-    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-    fi
-    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-    >"$1/stamp-it.tmp"
-    [sed '/^#/d
-	 s/^[[].*] *//
-	 /^[ 	]*$/d
-	'"s|^|	$ac_top_srcdir/|" \
-      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-    ]
-    [sed '/^POTFILES =/,/[^\\]$/ {
-		/^POTFILES =/!d
-		r $1/POTFILES
-	  }
-	 ' "$1/Makefile.in" >"$1/Makefile"]
-    rm -f "$1/Makefile.tmp"
-    mv "$1/stamp-it.tmp" "$1/stamp-it"
-  ])
-])dnl
-])
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
-
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE([nls],
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT([$USE_NLS])
-  AC_SUBST([USE_NLS])
-])
-
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
-        ])
-elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
-AC_DEFUN([PKG_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([pkgconfigdir],
-    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-    [with_pkgconfigdir=]pkg_default)
-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
-
-
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([noarch-pkgconfigdir],
-    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-    [with_noarch_pkgconfigdir=]pkg_default)
-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
-
-
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
-AC_DEFUN([PKG_CHECK_VAR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-
-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-AS_VAR_COPY([$1], [pkg_cv_][$1])
-
-AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
-
-AC_DEFUN([YELP_HELP_INIT],
-[
-AC_REQUIRE([AC_PROG_LN_S])
-m4_pattern_allow([AM_V_at])
-m4_pattern_allow([AM_V_GEN])
-m4_pattern_allow([AM_DEFAULT_VERBOSITY])
-
-YELP_LC_MEDIA_LINKS=true
-YELP_LC_DIST=true
-
-for yelpopt in [$1]; do
-  case $yelpopt in
-    lc-media-links)    YELP_LC_MEDIA_LINKS=true ;;
-    no-lc-media-links) YELP_LC_MEDIA_LINKS= ;;
-    lc-dist)           YELP_LC_DIST=true ;;
-    no-lc-dist)        YELP_LC_DIST= ;;
-    *) AC_MSG_ERROR([Unrecognized [YELP_HELP_INIT] option $yelpopt"]) ;;
-  esac
-done;
-AC_SUBST([YELP_LC_MEDIA_LINKS])
-AC_SUBST([YELP_LC_DIST])
-
-AC_ARG_WITH([help-dir],
-            AS_HELP_STRING([--with-help-dir=DIR],
-                           [path where help files are installed]),,
-            [with_help_dir='${datadir}/help'])
-HELP_DIR="$with_help_dir"
-AC_SUBST(HELP_DIR)
-
-AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command])
-AC_CHECK_PROG([ITSTOOL], [itstool], [itstool])
-if test x"$ITSTOOL" = x; then
-  AC_MSG_ERROR([itstool not found])
-fi
-
-AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command])
-AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint])
-if test x"$XMLLINT" = x; then
-  AC_MSG_ERROR([xmllint not found])
-fi
-
-YELP_HELP_RULES='
-HELP_ID ?=
-HELP_POT ?=
-HELP_FILES ?=
-HELP_EXTRA ?=
-HELP_MEDIA ?=
-HELP_LINGUAS ?=
-
-_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS))
-_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot))
-_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po))
-_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES))
-_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f))
-_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f))
-_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f))
-_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f)))
-_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp)
-
-_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1)
-_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V))
-_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V))
-_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V))
-_HELP_LC_VERBOSE_0 = @echo "  GEN    "$(dir [$]@);
-
-all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES)
-
-.PHONY: pot
-pot: $(_HELP_POTFILE)
-$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
-	$(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \
-	$(ITSTOOL) -o "[$]@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)")
-
-.PHONY: repo
-repo: $(_HELP_POTFILE)
-	$(AM_V_at)for po in $(_HELP_POFILES); do \
-	  if test "x[$](_HELP_V)" = "x0"; then echo "  GEN    $${po}"; fi; \
-	  msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \
-	done
-
-$(_HELP_POFILES):
-	$(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi
-	$(AM_V_at)if test ! -f "[$]@" -a -f "$(srcdir)/[$]@"; then cp "$(srcdir)/[$]@" "[$]@"; fi
-	$(AM_V_GEN)if ! test -f "[$]@"; then \
-	  (cd "$(dir [$]@)" && \
-	    $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \
-	    mv "$(notdir [$]@).tmp" "$(notdir [$]@)"); \
-	else \
-	  (cd "$(dir [$]@)" && \
-	    $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \
-	    msgmerge -o "$(notdir [$]@)" "$(notdir [$]@)" "$(notdir [$]@).tmp" && \
-	    rm "$(notdir [$]@).tmp"); \
-	fi
-
-$(_HELP_MOFILES): %.mo: %.po
-	$(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi
-	$(AM_V_GEN)msgfmt -o "[$]@" "$<"
-
-$(_HELP_LC_FILES): $(_HELP_LINGUAS)
-$(_HELP_LINGUAS): $(_HELP_LC_STAMPS)
-$(_HELP_LC_STAMPS): %.stamp: %.mo
-$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA)
-	$(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi
-	$(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \
-	mo="$(dir [$]@)$(patsubst %/$(notdir [$]@),%,[$]@).mo"; \
-	if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \
-	(cd "$(dir [$]@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \
-	touch "[$]@"
-
-.PHONY: clean-help
-mostlyclean-am: $(if $(HELP_ID),clean-help)
-clean-help:
-	rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES)
-
-EXTRA_DIST ?=
-EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
-EXTRA_DIST += $(if $(YELP_LC_DIST),$(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp))
-EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po)
-EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
-
-distdir: distdir-help-files
-distdir-help-files: $(_HELP_LC_FILES)
-	@for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \
-	  $(MKDIR_P) "$(distdir)/$$lc"; \
-	  for file in $(HELP_FILES); do \
-	    if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \
-	    cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \
-	  done; \
-	done; \
-
-.PHONY: check-help
-check: check-help
-check-help:
-	for lc in C $(_HELP_LINGUAS); do \
-	  if test -d "$$lc"; \
-	    then d=; \
-	    xmlpath="$$lc"; \
-	  else \
-	    d="$(srcdir)/"; \
-	    xmlpath="$$lc:$(srcdir)/$$lc"; \
-	  fi; \
-	  for page in $(HELP_FILES); do \
-	    echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \
-	    $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \
-	  done; \
-	done
-
-
-.PHONY: install-help
-install-data-am: $(if $(HELP_ID),install-help)
-install-help: $(_HELP_LC_FILES)
-	@for lc in C $(_HELP_LINGUAS); do \
-	  $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \
-	done
-	@for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \
-	  if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \
-	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	  if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \
-	  echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \
-	  $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \
-	done; done
-	@for f in $(_HELP_C_EXTRA); do \
-	  lc=`dirname "$$f"`; lc=`basename "$$lc"`; \
-	  if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \
-	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	  if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \
-	  echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \
-	  $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \
-	done
-	@for f in $(HELP_MEDIA); do \
-	  for lc in C $(_HELP_LINGUAS); do \
-	    if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \
-	    helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	    mdir=`dirname "$$f"`; \
-	    if test "x$mdir" = "x."; then mdir=""; fi; \
-	    if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \
-	    if test -f "$$d$$lc/$$f"; then \
-	      echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \
-	      $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \
-	    elif test "x$$lc" != "xC"; then \
-	      if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \
-	        echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
-	        $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
-	      fi; \
-	    fi; \
-	  done; \
-	done
-
-.PHONY: uninstall-help
-uninstall-am: $(if $(HELP_ID),uninstall-help)
-uninstall-help:
-	for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \
-	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	  echo "rm -f $$helpdir`basename $$f`"; \
-	  rm -f "$$helpdir`basename $$f`"; \
-	done; done
-	@for f in $(_HELP_C_EXTRA); do \
-	  lc=`dirname "$$f"`; lc=`basename "$$lc"`; \
-	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	  echo "rm -f $$helpdir`basename $$f`"; \
-	  rm -f "$$helpdir`basename $$f`"; \
-	done
-	@for f in $(HELP_MEDIA); do \
-	  for lc in C $(_HELP_LINGUAS); do \
-	    helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
-	    echo "rm -f $$helpdir$$f"; \
-	    rm -f "$$helpdir$$f"; \
-	  done; \
-	done;
-'
-AC_SUBST([YELP_HELP_RULES])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])])
-])
-
 # Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -2011,3 +1222,8 @@ AC_DEFUN([AM_PROG_VALAC],
       m4_default([$2], [:])
     fi])
 
+m4_include([m4/gsettings.m4])
+m4_include([m4/intltool.m4])
+m4_include([m4/nls.m4])
+m4_include([m4/pkg.m4])
+m4_include([m4/yelp.m4])
diff --git a/autogen.sh b/autogen.sh
index 8f3fc0d..34bf0c3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,21 +1,36 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
-
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="simple_scan"
-REQUIRED_AUTOMAKE_VERSION=1.7
-
-(test -f $srcdir/configure.ac \
-  && test -d $srcdir/src) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level simple-scan directory"
-    exit 1
+(test -f $srcdir/configure.ac) || {
+        echo "**Error**: Directory "\`$srcdir\'" does not look like the top-level project directory"
+        exit 1
 }
 
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
-    exit 1
-}
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+PKG_NAME=`autoconf --trace 'AC_INIT:$1' "$srcdir/configure.ac"`
+
+if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
+        echo "**Warning**: I am going to run \`configure' with no arguments." >&2
+        echo "If you wish to pass any to it, please specify them on the" >&2
+        echo \`$0\'" command line." >&2
+        echo "" >&2
+fi
+
+set -x
+aclocal --install || exit 1
+intltoolize --force --copy --automake || exit 1
+autoreconf --verbose --force --install -Wno-portability || exit 1
+set +x
+
+if [ "$NOCONFIGURE" = "" ]; then
+        set -x
+        $srcdir/configure "$@" || exit 1
+        set +x
+
+        if [ "$1" = "--help" ]; then exit 0 else
+                echo "Now type \`make\' to compile $PKG_NAME" || exit 1
+        fi
+else
+        echo "Skipping configure process."
+fi
diff --git a/configure b/configure
index f81a819..c606488 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.17.2.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.17.3.
 #
 #
 # 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.17.2'
-PACKAGE_STRING='simple-scan 3.17.2'
+PACKAGE_VERSION='3.17.3'
+PACKAGE_STRING='simple-scan 3.17.3'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -760,7 +760,6 @@ LDFLAGS
 CFLAGS
 CC
 VALAC
-DISABLE_DEPRECATED
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -1397,7 +1396,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.17.2 to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.17.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1463,7 +1462,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of simple-scan 3.17.2:";;
+     short | recursive ) echo "Configuration of simple-scan 3.17.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1579,7 +1578,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-simple-scan configure 3.17.2
+simple-scan configure 3.17.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1831,7 +1830,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.17.2, which was
+It was created by simple-scan $as_me 3.17.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2694,7 +2693,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='simple-scan'
- VERSION='3.17.2'
+ VERSION='3.17.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2851,18 +2850,6 @@ fi
 
 
 
-
-	DISABLE_DEPRECATED=""
-	if test $USE_MAINTAINER_MODE = yes; then
-	        DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP"
-	        for DOMAIN in $DOMAINS; do
-	               DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
-	        done
-	fi
-
-
-
-
 # Extract the first word of "valac", so it can be a program name with args.
 set dummy valac; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -6370,7 +6357,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.17.2, which was
+This file was extended by simple-scan $as_me 3.17.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6427,7 +6414,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.17.2
+simple-scan config.status 3.17.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 6f83589..d3b5138 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(simple-scan, 3.17.2)
+AC_INIT(simple-scan, 3.17.3)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
-GNOME_MAINTAINER_MODE_DEFINES
+AC_CONFIG_MACRO_DIR([m4])
 
 AM_PROG_VALAC([0.22.0], [], [AC_MSG_ERROR([Vala compiler not found])])
 AM_PROG_CC_C_O
diff --git a/data/Makefile.in b/data/Makefile.in
index dedafd0..fa2c5b0 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -80,7 +80,10 @@ subdir = data
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(dist_man1_MANS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/yelp.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -217,7 +220,6 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
diff --git a/data/appdata/Makefile.in b/data/appdata/Makefile.in
index d2ff28d..401dce1 100644
--- a/data/appdata/Makefile.in
+++ b/data/appdata/Makefile.in
@@ -79,7 +79,10 @@ POST_UNINSTALL = :
 subdir = data/appdata
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/yelp.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -153,7 +156,6 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 46ee6c5..aac46e3 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -78,7 +78,10 @@ POST_UNINSTALL = :
 subdir = data/icons
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/yelp.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -123,7 +126,6 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
diff --git a/help/Makefile.in b/help/Makefile.in
index 92625ba..2910469 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -78,7 +78,10 @@ POST_UNINSTALL = :
 subdir = help
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/yelp.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -123,7 +126,6 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
diff --git a/m4/gsettings.m4 b/m4/gsettings.m4
new file mode 100644
index 0000000..35ee5aa
--- /dev/null
+++ b/m4/gsettings.m4
@@ -0,0 +1,83 @@
+dnl GLIB_GSETTINGS
+dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
+dnl the schema should be compiled
+dnl
+
+AC_DEFUN([GLIB_GSETTINGS],
+[
+  m4_pattern_allow([AM_V_GEN])
+  AC_ARG_ENABLE(schemas-compile,
+                AS_HELP_STRING([--disable-schemas-compile],
+                               [Disable regeneration of gschemas.compiled on install]),
+                [case ${enableval} in
+                  yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
+                  no)  GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
+                 esac])
+  AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
+  PKG_PROG_PKG_CONFIG([0.16])
+  AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
+  if test x$cross_compiling != xyes; then
+    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
+  else
+    AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
+  fi
+  AC_SUBST(GLIB_COMPILE_SCHEMAS)
+  if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
+    ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
+  else
+    ifelse([$1],,[:],[$1])
+  fi
+
+  GSETTINGS_RULES='
+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
+
+mostlyclean-am: clean-gsettings-schemas
+
+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
+
+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@
+
+all-am: $(gsettings_SCHEMAS:.xml=.valid)
+uninstall-am: uninstall-gsettings-schemas
+install-data-am: install-gsettings-schemas
+
+.SECONDARY: $(gsettings_SCHEMAS)
+
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
+	@$(NORMAL_INSTALL)
+	if test -n "$^"; then \
+		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+	fi
+
+uninstall-gsettings-schemas:
+	@$(NORMAL_UNINSTALL)
+	@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
+	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+
+clean-gsettings-schemas:
+	rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+
+ifdef gsettings_ENUM_NAMESPACE
+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
+	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
+endif
+'
+  _GSETTINGS_SUBST(GSETTINGS_RULES)
+])
+
+dnl _GSETTINGS_SUBST(VARIABLE)
+dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+AC_DEFUN([_GSETTINGS_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
diff --git a/m4/intltool.m4 b/m4/intltool.m4
new file mode 100644
index 0000000..c25b7b1
--- /dev/null
+++ b/m4/intltool.m4
@@ -0,0 +1,212 @@
+## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
+## Copyright (C) 2001 Eazel, Inc.
+## Author: Maciej Stachowiak <mjs@noisehavoc.org>
+##         Kenneth Christiansen <kenneth@gnu.org>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+##
+## As a special exception to the GNU General Public License, if you
+## distribute this file as part of a program that contains a
+## configuration script generated by Autoconf, you may include it under
+## the same distribution terms that you use for the rest of that program.
+
+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+# serial 42 IT_PROG_INTLTOOL
+AC_DEFUN([IT_PROG_INTLTOOL], [
+AC_PREREQ([2.50])dnl
+AC_REQUIRE([AM_NLS])dnl
+
+case "$am__api_version" in
+    1.[01234])
+	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+    ;;
+    *)
+    ;;
+esac
+
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+if test -n "$1"; then
+    AC_MSG_CHECKING([for intltool >= $1])
+    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
+fi
+
+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
+fi
+
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+AC_SUBST([AM_DEFAULT_VERBOSITY])
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " [$]@;'
+AC_SUBST(INTLTOOL_V_MERGE)
+AC_SUBST(INTLTOOL__v_MERGE_)
+AC_SUBST(INTLTOOL__v_MERGE_0)
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
+AC_SUBST(intltool__v_merge_options_)
+AC_SUBST(intltool__v_merge_options_0)
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
+else
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
+fi
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
+_IT_SUBST(INTLTOOL_KEYS_RULE)
+_IT_SUBST(INTLTOOL_PROP_RULE)
+_IT_SUBST(INTLTOOL_OAF_RULE)
+_IT_SUBST(INTLTOOL_PONG_RULE)
+_IT_SUBST(INTLTOOL_SERVER_RULE)
+_IT_SUBST(INTLTOOL_SHEET_RULE)
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
+_IT_SUBST(INTLTOOL_UI_RULE)
+_IT_SUBST(INTLTOOL_XAM_RULE)
+_IT_SUBST(INTLTOOL_KBD_RULE)
+_IT_SUBST(INTLTOOL_XML_RULE)
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+_IT_SUBST(INTLTOOL_CAVES_RULE)
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
+_IT_SUBST(INTLTOOL_THEME_RULE)
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
+_IT_SUBST(INTLTOOL_POLICY_RULE)
+
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
+AC_PATH_PROG(MSGFMT, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+
+AC_PATH_PROG(INTLTOOL_PERL, perl)
+if test -z "$INTLTOOL_PERL"; then
+   AC_MSG_ERROR([perl not found])
+fi
+AC_MSG_CHECKING([for perl >= 5.8.1])
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
+else
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
+   AC_MSG_RESULT([$IT_PERL_VERSION])
+fi
+if test "x$2" != "xno-xml"; then
+   AC_MSG_CHECKING([for XML::Parser])
+   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+       AC_MSG_RESULT([ok])
+   else
+       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+   fi
+fi
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
+IT_PO_SUBDIR([po])
+
+])
+
+
+# IT_PO_SUBDIR(DIRNAME)
+# ---------------------
+# All po subdirs have to be declared with this macro; the subdir "po" is
+# declared by IT_PROG_INTLTOOL.
+#
+AC_DEFUN([IT_PO_SUBDIR],
+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+dnl
+dnl The following CONFIG_COMMANDS should be executed at the very end
+dnl of config.status.
+AC_CONFIG_COMMANDS_PRE([
+  AC_CONFIG_COMMANDS([$1/stamp-it], [
+    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
+       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
+    fi
+    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+    >"$1/stamp-it.tmp"
+    [sed '/^#/d
+	 s/^[[].*] *//
+	 /^[ 	]*$/d
+	'"s|^|	$ac_top_srcdir/|" \
+      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+    ]
+    [sed '/^POTFILES =/,/[^\\]$/ {
+		/^POTFILES =/!d
+		r $1/POTFILES
+	  }
+	 ' "$1/Makefile.in" >"$1/Makefile"]
+    rm -f "$1/Makefile.tmp"
+    mv "$1/stamp-it.tmp" "$1/stamp-it"
+  ])
+])dnl
+])
+
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+#
+AC_DEFUN([_IT_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
+# deprecated macros
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+
diff --git a/m4/nls.m4 b/m4/nls.m4
new file mode 100644
index 0000000..53cdc8b
--- /dev/null
+++ b/m4/nls.m4
@@ -0,0 +1,32 @@
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE([nls],
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT([$USE_NLS])
+  AC_SUBST([USE_NLS])
+])
diff --git a/m4/pkg.m4 b/m4/pkg.m4
new file mode 100644
index 0000000..c5b26b5
--- /dev/null
+++ b/m4/pkg.m4
@@ -0,0 +1,214 @@
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
diff --git a/m4/yelp.m4 b/m4/yelp.m4
new file mode 100644
index 0000000..5db847f
--- /dev/null
+++ b/m4/yelp.m4
@@ -0,0 +1,213 @@
+AC_DEFUN([YELP_HELP_INIT],
+[
+AC_REQUIRE([AC_PROG_LN_S])
+m4_pattern_allow([AM_V_at])
+m4_pattern_allow([AM_V_GEN])
+m4_pattern_allow([AM_DEFAULT_VERBOSITY])
+
+YELP_LC_MEDIA_LINKS=true
+YELP_LC_DIST=true
+
+for yelpopt in [$1]; do
+  case $yelpopt in
+    lc-media-links)    YELP_LC_MEDIA_LINKS=true ;;
+    no-lc-media-links) YELP_LC_MEDIA_LINKS= ;;
+    lc-dist)           YELP_LC_DIST=true ;;
+    no-lc-dist)        YELP_LC_DIST= ;;
+    *) AC_MSG_ERROR([Unrecognized [YELP_HELP_INIT] option $yelpopt"]) ;;
+  esac
+done;
+AC_SUBST([YELP_LC_MEDIA_LINKS])
+AC_SUBST([YELP_LC_DIST])
+
+AC_ARG_WITH([help-dir],
+            AS_HELP_STRING([--with-help-dir=DIR],
+                           [path where help files are installed]),,
+            [with_help_dir='${datadir}/help'])
+HELP_DIR="$with_help_dir"
+AC_SUBST(HELP_DIR)
+
+AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command])
+AC_CHECK_PROG([ITSTOOL], [itstool], [itstool])
+if test x"$ITSTOOL" = x; then
+  AC_MSG_ERROR([itstool not found])
+fi
+
+AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command])
+AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint])
+if test x"$XMLLINT" = x; then
+  AC_MSG_ERROR([xmllint not found])
+fi
+
+YELP_HELP_RULES='
+HELP_ID ?=
+HELP_POT ?=
+HELP_FILES ?=
+HELP_EXTRA ?=
+HELP_MEDIA ?=
+HELP_LINGUAS ?=
+
+_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS))
+_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot))
+_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po))
+_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES))
+_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f))
+_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f))
+_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f))
+_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f)))
+_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp)
+
+_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1)
+_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V))
+_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V))
+_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V))
+_HELP_LC_VERBOSE_0 = @echo "  GEN    "$(dir [$]@);
+
+all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES)
+
+.PHONY: pot
+pot: $(_HELP_POTFILE)
+$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
+	$(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \
+	$(ITSTOOL) -o "[$]@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)")
+
+.PHONY: repo
+repo: $(_HELP_POTFILE)
+	$(AM_V_at)for po in $(_HELP_POFILES); do \
+	  if test "x[$](_HELP_V)" = "x0"; then echo "  GEN    $${po}"; fi; \
+	  msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \
+	done
+
+$(_HELP_POFILES):
+	$(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi
+	$(AM_V_at)if test ! -f "[$]@" -a -f "$(srcdir)/[$]@"; then cp "$(srcdir)/[$]@" "[$]@"; fi
+	$(AM_V_GEN)if ! test -f "[$]@"; then \
+	  (cd "$(dir [$]@)" && \
+	    $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \
+	    mv "$(notdir [$]@).tmp" "$(notdir [$]@)"); \
+	else \
+	  (cd "$(dir [$]@)" && \
+	    $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \
+	    msgmerge -o "$(notdir [$]@)" "$(notdir [$]@)" "$(notdir [$]@).tmp" && \
+	    rm "$(notdir [$]@).tmp"); \
+	fi
+
+$(_HELP_MOFILES): %.mo: %.po
+	$(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi
+	$(AM_V_GEN)msgfmt -o "[$]@" "$<"
+
+$(_HELP_LC_FILES): $(_HELP_LINGUAS)
+$(_HELP_LINGUAS): $(_HELP_LC_STAMPS)
+$(_HELP_LC_STAMPS): %.stamp: %.mo
+$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA)
+	$(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi
+	$(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \
+	mo="$(dir [$]@)$(patsubst %/$(notdir [$]@),%,[$]@).mo"; \
+	if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \
+	(cd "$(dir [$]@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \
+	touch "[$]@"
+
+.PHONY: clean-help
+mostlyclean-am: $(if $(HELP_ID),clean-help)
+clean-help:
+	rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES)
+
+EXTRA_DIST ?=
+EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
+EXTRA_DIST += $(if $(YELP_LC_DIST),$(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp))
+EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po)
+EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
+
+distdir: distdir-help-files
+distdir-help-files: $(_HELP_LC_FILES)
+	@for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \
+	  $(MKDIR_P) "$(distdir)/$$lc"; \
+	  for file in $(HELP_FILES); do \
+	    if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \
+	    cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \
+	  done; \
+	done; \
+
+.PHONY: check-help
+check: check-help
+check-help:
+	for lc in C $(_HELP_LINGUAS); do \
+	  if test -d "$$lc"; \
+	    then d=; \
+	    xmlpath="$$lc"; \
+	  else \
+	    d="$(srcdir)/"; \
+	    xmlpath="$$lc:$(srcdir)/$$lc"; \
+	  fi; \
+	  for page in $(HELP_FILES); do \
+	    echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \
+	    $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \
+	  done; \
+	done
+
+
+.PHONY: install-help
+install-data-am: $(if $(HELP_ID),install-help)
+install-help: $(_HELP_LC_FILES)
+	@for lc in C $(_HELP_LINGUAS); do \
+	  $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \
+	done
+	@for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \
+	  if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \
+	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
+	  if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \
+	  echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \
+	  $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \
+	done; done
+	@for f in $(_HELP_C_EXTRA); do \
+	  lc=`dirname "$$f"`; lc=`basename "$$lc"`; \
+	  if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \
+	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
+	  if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \
+	  echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \
+	  $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \
+	done
+	@for f in $(HELP_MEDIA); do \
+	  for lc in C $(_HELP_LINGUAS); do \
+	    if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \
+	    helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
+	    mdir=`dirname "$$f"`; \
+	    if test "x$mdir" = "x."; then mdir=""; fi; \
+	    if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \
+	    if test -f "$$d$$lc/$$f"; then \
+	      echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \
+	      $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \
+	    elif test "x$$lc" != "xC"; then \
+	      if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \
+	        echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
+	        $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
+	      fi; \
+	    fi; \
+	  done; \
+	done
+
+.PHONY: uninstall-help
+uninstall-am: $(if $(HELP_ID),uninstall-help)
+uninstall-help:
+	for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \
+	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
+	  echo "rm -f $$helpdir`basename $$f`"; \
+	  rm -f "$$helpdir`basename $$f`"; \
+	done; done
+	@for f in $(_HELP_C_EXTRA); do \
+	  lc=`dirname "$$f"`; lc=`basename "$$lc"`; \
+	  helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
+	  echo "rm -f $$helpdir`basename $$f`"; \
+	  rm -f "$$helpdir`basename $$f`"; \
+	done
+	@for f in $(HELP_MEDIA); do \
+	  for lc in C $(_HELP_LINGUAS); do \
+	    helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
+	    echo "rm -f $$helpdir$$f"; \
+	    rm -f "$$helpdir$$f"; \
+	  done; \
+	done;
+'
+AC_SUBST([YELP_HELP_RULES])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])])
+])
diff --git a/po/af.po b/po/af.po
index 8dd3498..a7a5930 100644
--- a/po/af.po
+++ b/po/af.po
@@ -14,8 +14,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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:31+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/am.po b/po/am.po
index 00fc9bc..877300a 100644
--- a/po/am.po
+++ b/po/am.po
@@ -14,8 +14,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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/ar.po b/po/ar.po
index 3dfd7bd..a8af94c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -14,8 +14,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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/ast.po b/po/ast.po
index 0af4865..6a766df 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -14,8 +14,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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/az.po b/po/az.po
index 99cc308..efcac43 100644
--- a/po/az.po
+++ b/po/az.po
@@ -14,8 +14,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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/bg.po b/po/bg.po
index 3dac807..50b35e7 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -14,8 +14,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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/bo.po b/po/bo.po
index b7e2b25..3414ed3 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/ca.po b/po/ca.po
index 33c1142..51a1226 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -14,8 +14,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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index b58c699..f3fb111 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/ce.po b/po/ce.po
index 4528700..b2e05f3 100644
--- a/po/ce.po
+++ b/po/ce.po
@@ -14,8 +14,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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/cs.po b/po/cs.po
index ef5f386..727efc4 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,8 +14,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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/da.po b/po/da.po
index fd7012e..ada70f5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,8 +14,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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/de.po b/po/de.po
index bea0154..469740d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/el.po b/po/el.po
index 9b99e10..fab3961 100644
--- a/po/el.po
+++ b/po/el.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/en_GB.po b/po/en_GB.po
index 2546338..33026da 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/eo.po b/po/eo.po
index f1a7a96..dec6379 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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"
+"PO-Revision-Date: 2015-06-06 14:32+0000\n"
+"Last-Translator: Manuel Ortega <manuel@grupolasindias.coop>\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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-07 05:15+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 "Language: eo\n"
 
 #. Button to submit authorization dialog
@@ -90,7 +90,7 @@ msgstr "Foto"
 #. Title of dialog to reorder pages
 #: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Reordigi paĝojn"
 
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:30
@@ -150,7 +150,7 @@ msgstr "US Le_gal"
 #. Radio button for cropping page to 4x6 inch
 #: ../data/simple-scan.ui.h:52
 msgid "4×6"
-msgstr ""
+msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
 #: ../data/simple-scan.ui.h:54
@@ -280,21 +280,21 @@ msgstr "Paĝo-grando:"
 #. Label beside brightness scale
 #: ../data/simple-scan.ui.h:101
 msgid "Brightness:"
-msgstr ""
+msgstr "Brileco:"
 
 #. Label beside contrast scale
 #: ../data/simple-scan.ui.h:103
 msgid "Contrast:"
-msgstr ""
+msgstr "Kontrasto:"
 
 #. Label beside quality scale
 #: ../data/simple-scan.ui.h:105
 msgid "Quality:"
-msgstr ""
+msgstr "Kvalito:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "Dokumentoskanilo"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
@@ -302,7 +302,7 @@ msgstr "Skani dokumentojn"
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+msgstr "skani;skanilo;plata;adf;"
 
 #: ../data/simple-scan.appdata.xml.in.h:2
 msgid ""
@@ -361,19 +361,19 @@ msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "Skanbrileco"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Agordo de la brileco de -100 al 100 (0 egalas al neagordo)."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "Skankontrasto"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Agordo de kontrasto de -100 al 100 (0 egalas al neagordo)."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
@@ -412,11 +412,11 @@ msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Kvalito por JPEG-densigo"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Kvalito por JPEG-densigo"
 
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
@@ -480,7 +480,7 @@ msgstr "Skanita Dokumento.pdf"
 
 #: ../src/ui.vala:316 ../src/ui.vala:1745
 msgid "_Close"
-msgstr ""
+msgstr "_Fermi"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
 #: ../src/ui.vala:324
@@ -505,11 +505,11 @@ msgstr "Konservi kiel..."
 
 #: ../src/ui.vala:510 ../src/ui.vala:672
 msgid "_Cancel"
-msgstr ""
+msgstr "_Nuligi"
 
 #: ../src/ui.vala:511 ../src/ui.vala:673
 msgid "_Save"
-msgstr ""
+msgstr "Kon_servi"
 
 #. Save dialog: Filter name to show only image files
 #: ../src/ui.vala:521
@@ -574,22 +574,22 @@ msgstr "Ne eblis malfermi bild-dosieron"
 #. Label on button for combining sides in reordering dialog
 #: ../src/ui.vala:1203
 msgid "Combine sides"
-msgstr ""
+msgstr "Kombini flankojn"
 
 #. Label on button for combining sides in reverse order in reordering dialog
 #: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Kombini flankojn"
 
 #. Label on button for reversing in reordering dialog
 #: ../src/ui.vala:1223
 msgid "Reverse"
-msgstr ""
+msgstr "Inversigi"
 
 #. Label on button for cancelling page reordering dialog
 #: ../src/ui.vala:1233
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Konservi senŝanĝa"
 
 #. Error message displayed when unable to launch help browser
 #: ../src/ui.vala:1448
@@ -643,6 +643,7 @@ msgstr ""
 "  Donald Rogers https://launchpad.net/~dero9753\n"
 "  Kristjan SCHMIDT https://launchpad.net/~kristjan-eo\n"
 "  Leo Arias https://launchpad.net/~elopio\n"
+"  Manuel Ortega https://launchpad.net/~elektrolupo\n"
 "  Michael Moroni https://launchpad.net/~airon90\n"
 "  Patrick (Petriko) Oudejans https://launchpad.net/~patrickoudejans\n"
 "  Robert Ancell https://launchpad.net/~robert-ancell\n"
@@ -722,27 +723,27 @@ msgstr "Aŭtomata"
 
 #: ../src/ui.vala:1803
 msgid "Darker"
-msgstr ""
+msgstr "Pli malhele"
 
 #: ../src/ui.vala:1805
 msgid "Lighter"
-msgstr ""
+msgstr "Pli hele"
 
 #: ../src/ui.vala:1813
 msgid "Less"
-msgstr ""
+msgstr "Malpli"
 
 #: ../src/ui.vala:1815
 msgid "More"
-msgstr ""
+msgstr "Pli"
 
 #: ../src/ui.vala:1823
 msgid "Minimum"
-msgstr ""
+msgstr "Minimume"
 
 #: ../src/ui.vala:1825
 msgid "Maximum"
-msgstr ""
+msgstr "Maksimume"
 
 #: ../src/ui.vala:1866
 msgid "Saving document..."
diff --git a/po/es.po b/po/es.po
index 9fd4fef..48927c2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2015-04-15 12:17+1200\n"
-"PO-Revision-Date: 2014-07-22 10:50+0000\n"
+"PO-Revision-Date: 2015-05-25 02:42+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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -310,11 +310,17 @@ msgid ""
 "print your scans, export them to pdf, or save them in a range of image "
 "formats."
 msgstr ""
+"Escanee documentos y fotos con suma sencillez. Es posible recortar las "
+"partes no deseadas de una foto y girarla si quedó al revés. Luego podrá "
+"imprimir las digitalizaciones, exportarlas a PDF o guardarlas en diversos "
+"formatos de imagen."
 
 #: ../data/simple-scan.appdata.xml.in.h:3
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
+"Simple Scan emplea el marco SANE para compatibilidad con la mayoría de los "
+"escáneres existentes."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
@@ -649,6 +655,7 @@ msgstr ""
 "  DiegoJ https://launchpad.net/~diegojromerolopez\n"
 "  Edgardo Fredz https://launchpad.net/~edgardo-fredz\n"
 "  FAMM https://launchpad.net/~famm94-deactivatedaccount\n"
+"  Fco. Javier Serrador https://launchpad.net/~serrador-tecknolabs\n"
 "  Genesis Bustamante https://launchpad.net/~genmarc\n"
 "  Guillermo RP https://launchpad.net/~guille-arp\n"
 "  Jonay https://launchpad.net/~jonay-santana\n"
@@ -665,8 +672,7 @@ msgstr ""
 "  elXATU https://launchpad.net/~elxatu\n"
 "  felix.anadon@gmail.com https://launchpad.net/~felix-anadon\n"
 "  fosk https://launchpad.net/~oscarrdg\n"
-"  hhlp https://launchpad.net/~hhlp-deactivatedaccount\n"
-"  serrador https://launchpad.net/~fserrador"
+"  hhlp https://launchpad.net/~hhlp-deactivatedaccount"
 
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.vala:1506
diff --git a/po/et.po b/po/et.po
index a8edb7d..25b6dbb 100644
--- a/po/et.po
+++ b/po/et.po
@@ -14,8 +14,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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/eu.po b/po/eu.po
index 5c91845..40e3ea8 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -14,8 +14,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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/fi.po b/po/fi.po
index 4369625..a1bf09e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -14,8 +14,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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/fr.po b/po/fr.po
index 42f65ee..908f3db 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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"
+"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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -672,7 +672,7 @@ msgstr ""
 "  François Tissandier https://launchpad.net/~baloo\n"
 "  Grégoire Seux https://launchpad.net/~kamaradclimber\n"
 "  Guillaume Lanquepin-Chesnais https://launchpad.net/~guyomel\n"
-"  Jean Marc https://launchpad.net/~m-balthazar\n"
+"  Jean-Marc https://launchpad.net/~m-balthazar\n"
 "  Jörg BUCHMANN https://launchpad.net/~jorg-buchmann\n"
 "  Kaïs Bejaoui https://launchpad.net/~kais\n"
 "  Manuel Berrocal https://launchpad.net/~manu-berrocal\n"
diff --git a/po/gd.po b/po/gd.po
index a51adf0..6f7ca24 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/gl.po b/po/gl.po
index 459cd36..f7b3a49 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/he.po b/po/he.po
index caaa4fc..ba6f6c1 100644
--- a/po/he.po
+++ b/po/he.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/hr.po b/po/hr.po
index 24d4d92..ffca44e 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/hu.po b/po/hu.po
index 31eab4e..2de8d3c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/hy.po b/po/hy.po
index 3432d00..94edf55 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -14,8 +14,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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/id.po b/po/id.po
index 346ebb3..8277220 100644
--- a/po/id.po
+++ b/po/id.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -293,7 +293,7 @@ msgstr "Kualitas:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "Pelarik Dokumen"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
@@ -301,7 +301,7 @@ msgstr "Pindai Dokumen"
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+msgstr "scan;scanner;pelarik;pemindai;flatbed;adf;"
 
 #: ../data/simple-scan.appdata.xml.in.h:2
 msgid ""
diff --git a/po/it.po b/po/it.po
index 4a9e0f2..0d2e07b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/ja.po b/po/ja.po
index 83c759f..dd0c723 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/kk.po b/po/kk.po
index a86ccef..9bb0b02 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/km.po b/po/km.po
index 220cfc0..3999679 100644
--- a/po/km.po
+++ b/po/km.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/ky.po b/po/ky.po
index 4f817a4..fa81771 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/lt.po b/po/lt.po
index ea69942..02b1b12 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/lv.po b/po/lv.po
index acb24d0..501f34f 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/mhr.po b/po/mhr.po
index 746048f..15962ce 100644
--- a/po/mhr.po
+++ b/po/mhr.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/ms.po b/po/ms.po
index d5b2cbe..aa013d2 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/my.po b/po/my.po
index f32a96a..8e9bab0 100644
--- a/po/my.po
+++ b/po/my.po
@@ -14,8 +14,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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/nb.po b/po/nb.po
index 8e7d8ea..51424a9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/nl.po b/po/nl.po
index 330b177..b0330a4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,8 +14,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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/oc.po b/po/oc.po
index 54cf21a..63a6e75 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/pa.po b/po/pa.po
index 1acfd4c..6ce3dc3 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/pl.po b/po/pl.po
index 5c8c3d1..fce96c0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/pt.po b/po/pt.po
index b65dab5..610f3b1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d7476a0..5b51a77 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/ro.po b/po/ro.po
index 6518f00..276d920 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 "Language: ro\n"
 
 #. Button to submit authorization dialog
diff --git a/po/ru.po b/po/ru.po
index 4bcabe6..64d288e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/sd.po b/po/sd.po
index d17992e..069d9bb 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/se.po b/po/se.po
index 86b2924..d1f5c6e 100644
--- a/po/se.po
+++ b/po/se.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/shn.po b/po/shn.po
index 6ff65b9..de509b6 100644
--- a/po/shn.po
+++ b/po/shn.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/sk.po b/po/sk.po
index ea1fb61..9f208c2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -641,7 +641,7 @@ msgstr ""
 "  6205 https://launchpad.net/~6205-reactivated-deactivatedaccount\n"
 "  Alessio Treglia https://launchpad.net/~quadrispro\n"
 "  Laco Gubík https://launchpad.net/~laco\n"
-"  Pavol Klačanský https://launchpad.net/~pavolzetor\n"
+"  Pavol Klačanský https://launchpad.net/~pavolzetor-deactivatedaccount\n"
 "  Prescott_SK https://launchpad.net/~prescott66\n"
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
diff --git a/po/sl.po b/po/sl.po
index c4bced1..f7bbe34 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -644,6 +644,7 @@ msgstr ""
 "  Andrej Znidarsic https://launchpad.net/~andrej.znidarsic\n"
 "  Damir Jerovšek https://launchpad.net/~jierro\n"
 "  Klemen Košir https://launchpad.net/~klemen.kosir\n"
+"  Martin Srebotnjak https://launchpad.net/~miles\n"
 "  Robert Hrovat https://launchpad.net/~robi-hipnos\n"
 "  Sasa Batistic https://launchpad.net/~sasa-batistic\n"
 "  grofaty https://launchpad.net/~grofaty"
diff --git a/po/sq.po b/po/sq.po
index f482ef2..8c1bd90 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -14,8 +14,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-05-05 05:29+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/sr.po b/po/sr.po
index f538624..5a81795 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -13,8 +13,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-05-20 05:11+0000\n"
-"X-Generator: Launchpad (build 17508)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 "Language: sr\n"
 
 #. Button to submit authorization dialog
diff --git a/po/sv.po b/po/sv.po
index 5283c4c..5610007 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/ta.po b/po/ta.po
index bf1fa3e..90b1b22 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/te.po b/po/te.po
index 1c91cad..5c23614 100644
--- a/po/te.po
+++ b/po/te.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/th.po b/po/th.po
index 3888019..a4b01fd 100644
--- a/po/th.po
+++ b/po/th.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/tr.po b/po/tr.po
index 7420b6d..7932dad 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/ug.po b/po/ug.po
index 48298bb..8d595af 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 "X-Poedit-Language: Uighur\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
diff --git a/po/uk.po b/po/uk.po
index 3bf8d17..03f6978 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/ur.po b/po/ur.po
index 4865d14..bf1b5b8 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/uz.po b/po/uz.po
index a125dd2..3dec2df 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/vi.po b/po/vi.po
index 0cd9c95..73db1e9 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 58e4cff..360d4f6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9f70cf4..ff3d95f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -14,8 +14,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-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 17540)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
diff --git a/src/Makefile.in b/src/Makefile.in
index 25fe3a8..587b9b4 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -84,7 +84,10 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am book.c \
 	autosave-manager.c $(top_srcdir)/depcomp \
 	$(srcdir)/simple_scan_vala.stamp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/yelp.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -186,7 +189,6 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
diff --git a/src/autosave-manager.c b/src/autosave-manager.c
index 3c36bfe..e4b37a9 100644
--- a/src/autosave-manager.c
+++ b/src/autosave-manager.c
@@ -1,4 +1,4 @@
-/* autosave-manager.c generated by valac 0.26.2, the Vala compiler
+/* autosave-manager.c generated by valac 0.28.0, the Vala compiler
  * generated from autosave-manager.vala, do not modify */
 
 /*
diff --git a/src/book-view.c b/src/book-view.c
index 7c44f03..303ba61 100644
--- a/src/book-view.c
+++ b/src/book-view.c
@@ -1,4 +1,4 @@
-/* book-view.c generated by valac 0.26.2, the Vala compiler
+/* book-view.c generated by valac 0.28.0, the Vala compiler
  * generated from book-view.vala, do not modify */
 
 /*
@@ -3014,11 +3014,12 @@ static void book_view_set_cursor (BookView* self, GdkCursorType cursor) {
 	GdkCursorType _tmp0_ = 0;
 	GdkCursorType _tmp1_ = 0;
 	GdkCursorType _tmp2_ = 0;
-	GdkCursorType _tmp3_ = 0;
-	GdkCursor* _tmp4_ = NULL;
-	GtkWidget* _tmp5_ = NULL;
-	GdkWindow* _tmp6_ = NULL;
-	GdkCursor* _tmp7_ = NULL;
+	GdkDisplay* _tmp3_ = NULL;
+	GdkCursorType _tmp4_ = 0;
+	GdkCursor* _tmp5_ = NULL;
+	GtkWidget* _tmp6_ = NULL;
+	GdkWindow* _tmp7_ = NULL;
+	GdkCursor* _tmp8_ = NULL;
 #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/trunk/src/book-view.vala"
@@ -3031,31 +3032,33 @@ static void book_view_set_cursor (BookView* self, GdkCursorType cursor) {
 		_g_object_unref0 (c);
 #line 527 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
-#line 3035 "book-view.c"
+#line 3036 "book-view.c"
 	}
 #line 528 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = cursor;
 #line 528 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->cursor = _tmp2_;
 #line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp3_ = cursor;
+	_tmp3_ = gtk_widget_get_display ((GtkWidget*) self);
 #line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp4_ = gdk_cursor_new (_tmp3_);
+	_tmp4_ = cursor;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp5_ = gdk_cursor_new_for_display (_tmp3_, _tmp4_);
 #line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (c);
 #line 530 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	c = _tmp4_;
+	c = _tmp5_;
 #line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp5_ = self->priv->drawing_area;
+	_tmp6_ = self->priv->drawing_area;
 #line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp6_ = gtk_widget_get_window (_tmp5_);
+	_tmp7_ = gtk_widget_get_window (_tmp6_);
 #line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp7_ = c;
+	_tmp8_ = c;
 #line 531 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gdk_window_set_cursor (_tmp6_, _tmp7_);
+	gdk_window_set_cursor (_tmp7_, _tmp8_);
 #line 522 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (c);
-#line 3059 "book-view.c"
+#line 3062 "book-view.c"
 }
 
 
@@ -3077,7 +3080,7 @@ static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEvent
 	_tmp1_ = self->priv->selected_page_view;
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp1_ != NULL) {
-#line 3081 "book-view.c"
+#line 3084 "book-view.c"
 		GdkEventMotion* _tmp2_ = NULL;
 		GdkModifierType _tmp3_ = 0;
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
@@ -3086,15 +3089,15 @@ static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEvent
 		_tmp3_ = _tmp2_->state;
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = (_tmp3_ & GDK_BUTTON1_MASK) != 0;
-#line 3090 "book-view.c"
+#line 3093 "book-view.c"
 	} else {
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = FALSE;
-#line 3094 "book-view.c"
+#line 3097 "book-view.c"
 	}
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp0_) {
-#line 3098 "book-view.c"
+#line 3101 "book-view.c"
 		gint x = 0;
 		GdkEventMotion* _tmp4_ = NULL;
 		gdouble _tmp5_ = 0.0;
@@ -3159,7 +3162,7 @@ static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEvent
 		_tmp21_ = _tmp20_;
 #line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		cursor = _tmp21_;
-#line 3163 "book-view.c"
+#line 3166 "book-view.c"
 	} else {
 		gint x = 0;
 		gint y = 0;
@@ -3198,7 +3201,7 @@ static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEvent
 		_tmp31_ = over_page;
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		if (_tmp31_ != NULL) {
-#line 3202 "book-view.c"
+#line 3205 "book-view.c"
 			PageView* _tmp32_ = NULL;
 			gint _tmp33_ = 0;
 			gint _tmp34_ = 0;
@@ -3221,11 +3224,11 @@ static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEvent
 			_tmp37_ = _tmp36_;
 #line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			cursor = _tmp37_;
-#line 3225 "book-view.c"
+#line 3228 "book-view.c"
 		}
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_view_unref0 (over_page);
-#line 3229 "book-view.c"
+#line 3232 "book-view.c"
 	}
 #line 557 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp38_ = cursor;
@@ -3235,7 +3238,7 @@ static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEvent
 	result = FALSE;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 3239 "book-view.c"
+#line 3242 "book-view.c"
 }
 
 
@@ -3257,7 +3260,7 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 	switch (_tmp1_) {
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xff50:
-#line 3261 "book-view.c"
+#line 3264 "book-view.c"
 		{
 			Book* _tmp2_ = NULL;
 			Page* _tmp3_ = NULL;
@@ -3276,11 +3279,11 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 			result = TRUE;
 #line 568 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
-#line 3280 "book-view.c"
+#line 3283 "book-view.c"
 		}
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xff51:
-#line 3284 "book-view.c"
+#line 3287 "book-view.c"
 		{
 			PageView* _tmp5_ = NULL;
 			PageView* _tmp6_ = NULL;
@@ -3299,11 +3302,11 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 			result = TRUE;
 #line 571 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
-#line 3303 "book-view.c"
+#line 3306 "book-view.c"
 		}
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xff53:
-#line 3307 "book-view.c"
+#line 3310 "book-view.c"
 		{
 			PageView* _tmp8_ = NULL;
 			PageView* _tmp9_ = NULL;
@@ -3322,11 +3325,11 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 			result = TRUE;
 #line 574 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
-#line 3326 "book-view.c"
+#line 3329 "book-view.c"
 		}
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xFF57:
-#line 3330 "book-view.c"
+#line 3333 "book-view.c"
 		{
 			Book* _tmp11_ = NULL;
 			Book* _tmp12_ = NULL;
@@ -3354,7 +3357,7 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 			result = TRUE;
 #line 577 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
-#line 3358 "book-view.c"
+#line 3361 "book-view.c"
 		}
 		default:
 		{
@@ -3362,7 +3365,7 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 			result = FALSE;
 #line 580 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
-#line 3366 "book-view.c"
+#line 3369 "book-view.c"
 		}
 	}
 }
@@ -3385,7 +3388,7 @@ static gboolean book_view_focus_cb (BookView* self, GtkWidget* widget, GdkEventF
 	result = FALSE;
 #line 587 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 3389 "book-view.c"
+#line 3392 "book-view.c"
 }
 
 
@@ -3401,7 +3404,7 @@ static void book_view_scroll_cb (BookView* self, GtkAdjustment* adjustment) {
 	if (!_tmp0_) {
 #line 593 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_redraw (self);
-#line 3405 "book-view.c"
+#line 3408 "book-view.c"
 	}
 }
 
@@ -3414,7 +3417,7 @@ void book_view_redraw (BookView* self) {
 	_tmp0_ = self->priv->drawing_area;
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_queue_draw (_tmp0_);
-#line 3418 "book-view.c"
+#line 3421 "book-view.c"
 }
 
 
@@ -3434,7 +3437,7 @@ void book_view_select_next_page (BookView* self) {
 	book_view_select_page_view (self, _tmp2_);
 #line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (_tmp2_);
-#line 3438 "book-view.c"
+#line 3441 "book-view.c"
 }
 
 
@@ -3454,7 +3457,7 @@ void book_view_select_prev_page (BookView* self) {
 	book_view_select_page_view (self, _tmp2_);
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (_tmp2_);
-#line 3458 "book-view.c"
+#line 3461 "book-view.c"
 }
 
 
@@ -3469,14 +3472,14 @@ Book* book_view_get_book (BookView* self) {
 	result = _tmp0_;
 #line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 3473 "book-view.c"
+#line 3476 "book-view.c"
 }
 
 
 static gpointer _book_ref0 (gpointer self) {
 #line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self ? book_ref (self) : NULL;
-#line 3480 "book-view.c"
+#line 3483 "book-view.c"
 }
 
 
@@ -3495,7 +3498,7 @@ static void book_view_set_book (BookView* self, Book* value) {
 	self->priv->_book = _tmp1_;
 #line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_notify ((GObject *) self, "book");
-#line 3499 "book-view.c"
+#line 3502 "book-view.c"
 }
 
 
@@ -3508,7 +3511,7 @@ Page* book_view_get_selected_page (BookView* self) {
 	_tmp0_ = self->priv->selected_page_view;
 #line 32 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp0_ != NULL) {
-#line 3512 "book-view.c"
+#line 3515 "book-view.c"
 		PageView* _tmp1_ = NULL;
 		Page* _tmp2_ = NULL;
 		Page* _tmp3_ = NULL;
@@ -3522,13 +3525,13 @@ Page* book_view_get_selected_page (BookView* self) {
 		result = _tmp3_;
 #line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
-#line 3526 "book-view.c"
+#line 3529 "book-view.c"
 	} else {
 #line 35 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		result = NULL;
 #line 35 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
-#line 3532 "book-view.c"
+#line 3535 "book-view.c"
 	}
 }
 
@@ -3550,13 +3553,13 @@ void book_view_set_selected_page (BookView* self, Page* value) {
 	if (_tmp1_ == _tmp2_) {
 #line 40 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
-#line 3554 "book-view.c"
+#line 3557 "book-view.c"
 	}
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = value;
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp3_ != NULL) {
-#line 3560 "book-view.c"
+#line 3563 "book-view.c"
 		GHashTable* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
 		gconstpointer _tmp6_ = NULL;
@@ -3568,15 +3571,15 @@ void book_view_set_selected_page (BookView* self, Page* value) {
 		_tmp6_ = g_hash_table_lookup (_tmp4_, _tmp5_);
 #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"
+#line 3575 "book-view.c"
 	} else {
 #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 3579 "book-view.c"
 	}
 #line 37 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_notify ((GObject *) self, "selected-page");
-#line 3580 "book-view.c"
+#line 3583 "book-view.c"
 }
 
 
@@ -3594,7 +3597,7 @@ gint book_view_get_x_offset (BookView* self) {
 	result = (gint) _tmp1_;
 #line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 3598 "book-view.c"
+#line 3601 "book-view.c"
 }
 
 
@@ -3611,7 +3614,7 @@ void book_view_set_x_offset (BookView* self, gint value) {
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
 #line 68 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_notify ((GObject *) self, "x-offset");
-#line 3615 "book-view.c"
+#line 3618 "book-view.c"
 }
 
 
@@ -3630,19 +3633,19 @@ static void g_cclosure_user_marshal_VOID__PAGE (GClosure * closure, GValue * ret
 		data1 = closure->data;
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 3634 "book-view.c"
+#line 3637 "book-view.c"
 	} else {
 #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/trunk/src/book-view.vala"
 		data2 = closure->data;
-#line 3640 "book-view.c"
+#line 3643 "book-view.c"
 	}
 #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/trunk/src/book-view.vala"
 	callback (data1, value_get_page (param_values + 1), data2);
-#line 3646 "book-view.c"
+#line 3649 "book-view.c"
 }
 
 
@@ -3669,7 +3672,7 @@ static void book_view_class_init (BookViewClass * klass) {
 	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/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"
+#line 3676 "book-view.c"
 }
 
 
@@ -3678,7 +3681,7 @@ static void book_view_instance_init (BookView * self) {
 	self->priv = BOOK_VIEW_GET_PRIVATE (self);
 #line 27 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->selected_page_view = NULL;
-#line 3682 "book-view.c"
+#line 3685 "book-view.c"
 }
 
 
@@ -3804,7 +3807,7 @@ static void book_view_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->adjustment);
 #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"
+#line 3811 "book-view.c"
 }
 
 
@@ -3843,13 +3846,13 @@ static void _vala_book_view_get_property (GObject * object, guint property_id, G
 		g_value_set_int (value, book_view_get_x_offset (self));
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		break;
-#line 3847 "book-view.c"
+#line 3850 "book-view.c"
 		default:
 #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/trunk/src/book-view.vala"
 		break;
-#line 3853 "book-view.c"
+#line 3856 "book-view.c"
 	}
 }
 
@@ -3877,13 +3880,13 @@ static void _vala_book_view_set_property (GObject * object, guint property_id, c
 		book_view_set_x_offset (self, g_value_get_int (value));
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		break;
-#line 3881 "book-view.c"
+#line 3884 "book-view.c"
 		default:
 #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/trunk/src/book-view.vala"
 		break;
-#line 3887 "book-view.c"
+#line 3890 "book-view.c"
 	}
 }
 
diff --git a/src/book-view.vala b/src/book-view.vala
index 7e337f1..08439be 100644
--- a/src/book-view.vala
+++ b/src/book-view.vala
@@ -527,7 +527,7 @@ public class BookView : Gtk.Box
             return;
         this.cursor = cursor;
 
-        c = new Gdk.Cursor (cursor);
+        c = new Gdk.Cursor.for_display (get_display (), cursor);
         drawing_area.get_window ().set_cursor (c);
     }
 
diff --git a/src/book.c b/src/book.c
index d25c072..969c8de 100644
--- a/src/book.c
+++ b/src/book.c
@@ -1,4 +1,4 @@
-/* book.c generated by valac 0.26.2, the Vala compiler
+/* book.c generated by valac 0.28.0, the Vala compiler
  * generated from book.vala, do not modify */
 
 /*
@@ -832,33 +832,33 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 930 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 930 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) (-1), _tmp1_);
-#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 933 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 933 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 933 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 933 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 850 "book.c"
 		gchar* _tmp4_ = NULL;
-#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
 #line 858 "book.c"
 	} else {
-#line 936 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 936 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		result = -1;
-#line 936 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 936 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
 #line 864 "book.c"
 	}
@@ -882,103 +882,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1230 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1230 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1232 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1232 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
 #line 898 "book.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
 #line 907 "book.c"
 	}
-#line 1235 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1235 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
 #line 913 "book.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
 #line 922 "book.c"
 	}
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
 #line 928 "book.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
 #line 937 "book.c"
 	} else {
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
 #line 941 "book.c"
 	}
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
 #line 949 "book.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
 #line 958 "book.c"
 	} else {
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
 #line 962 "book.c"
 	}
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
 #line 984 "book.c"
 }
@@ -4902,47 +4902,47 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
 	gint _tmp6_ = 0;
 	gchar* _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
-#line 1307 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp1_ + 1;
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	__result__size_ = _result__length1;
-#line 1309 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1309 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp3_ = _result__length1;
-#line 1309 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1309 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp3_ - 1;
-#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp4_ = _result_;
-#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _result__length1;
-#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp5_ = strlen (self);
-#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp6_ = _tmp5_;
-#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	memcpy (_tmp4_, self, (gsize) _tmp6_);
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp7_ = _result_;
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp7__length1 = _result__length1;
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp7__length1;
 #line 4942 "book.c"
 	}
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	result = _tmp7_;
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
 #line 4948 "book.c"
 }
diff --git a/src/page-view.c b/src/page-view.c
index a5377dd..3a4d582 100644
--- a/src/page-view.c
+++ b/src/page-view.c
@@ -1,4 +1,4 @@
-/* page-view.c generated by valac 0.26.2, the Vala compiler
+/* page-view.c generated by valac 0.28.0, the Vala compiler
  * generated from page-view.vala, do not modify */
 
 /*
diff --git a/src/page.c b/src/page.c
index 417f870..5fc7d4b 100644
--- a/src/page.c
+++ b/src/page.c
@@ -1,4 +1,4 @@
-/* page.c generated by valac 0.26.2, the Vala compiler
+/* page.c generated by valac 0.28.0, the Vala compiler
  * generated from page.vala, do not modify */
 
 /*
@@ -2711,47 +2711,47 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
 	gint _tmp6_ = 0;
 	gchar* _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
-#line 1307 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp1_ + 1;
-#line 1308 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	__result__size_ = _result__length1;
-#line 1309 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1309 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp3_ = _result__length1;
-#line 1309 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1309 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp3_ - 1;
-#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp4_ = _result_;
-#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _result__length1;
-#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp5_ = strlen (self);
-#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp6_ = _tmp5_;
-#line 1310 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	memcpy (_tmp4_, self, (gsize) _tmp6_);
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp7_ = _result_;
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp7__length1 = _result__length1;
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp7__length1;
 #line 2751 "page.c"
 	}
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	result = _tmp7_;
-#line 1311 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1311 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
 #line 2757 "page.c"
 }
@@ -3426,6 +3426,38 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 				keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
 #line 3428 "page.c"
 			} else {
+				const gchar* _tmp76_ = NULL;
+				gchar* _tmp77_ = NULL;
+				gchar* _tmp78_ = NULL;
+				GError* _tmp79_ = NULL;
+				GError* _tmp80_ = NULL;
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp76_ = type;
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp77_ = g_strdup_printf ("Unknown file type: %s", _tmp76_);
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp78_ = _tmp77_;
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp79_ = g_error_new_literal (G_FILE_ERROR, G_FILE_ERROR_INVAL, _tmp78_);
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_tmp80_ = _tmp79_;
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_g_free0 (_tmp78_);
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_inner_error_ = _tmp80_;
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				g_propagate_error (error, _inner_error_);
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_g_free0 (icc_profile_data);
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_g_object_unref0 (image);
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_pixbuf_writer_unref0 (writer);
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				_g_object_unref0 (stream);
+#line 688 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+				return;
+#line 3461 "page.c"
 			}
 		}
 	}
@@ -3437,7 +3469,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 	_pixbuf_writer_unref0 (writer);
 #line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (stream);
-#line 3441 "page.c"
+#line 3473 "page.c"
 }
 
 
@@ -3456,7 +3488,7 @@ gint page_get_width (Page* self) {
 	if (_tmp2_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
 #line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = TRUE;
-#line 3460 "page.c"
+#line 3492 "page.c"
 	} else {
 		ScanDirection _tmp3_ = 0;
 		ScanDirection _tmp4_ = 0;
@@ -3466,11 +3498,11 @@ gint page_get_width (Page* self) {
 		_tmp4_ = _tmp3_;
 #line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp4_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 3470 "page.c"
+#line 3502 "page.c"
 	}
 #line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp0_) {
-#line 3474 "page.c"
+#line 3506 "page.c"
 		gint _tmp5_ = 0;
 #line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = self->priv->_scan_width;
@@ -3478,7 +3510,7 @@ gint page_get_width (Page* self) {
 		result = _tmp5_;
 #line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
-#line 3482 "page.c"
+#line 3514 "page.c"
 	} else {
 		gint _tmp6_ = 0;
 #line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -3487,7 +3519,7 @@ gint page_get_width (Page* self) {
 		result = _tmp6_;
 #line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
-#line 3491 "page.c"
+#line 3523 "page.c"
 	}
 }
 
@@ -3507,7 +3539,7 @@ gint page_get_height (Page* self) {
 	if (_tmp2_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = TRUE;
-#line 3511 "page.c"
+#line 3543 "page.c"
 	} else {
 		ScanDirection _tmp3_ = 0;
 		ScanDirection _tmp4_ = 0;
@@ -3517,11 +3549,11 @@ gint page_get_height (Page* self) {
 		_tmp4_ = _tmp3_;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp4_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 3521 "page.c"
+#line 3553 "page.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp0_) {
-#line 3525 "page.c"
+#line 3557 "page.c"
 		gint _tmp5_ = 0;
 #line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = self->priv->_scan_height;
@@ -3529,7 +3561,7 @@ gint page_get_height (Page* self) {
 		result = _tmp5_;
 #line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
-#line 3533 "page.c"
+#line 3565 "page.c"
 	} else {
 		gint _tmp6_ = 0;
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -3538,7 +3570,7 @@ gint page_get_height (Page* self) {
 		result = _tmp6_;
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
-#line 3542 "page.c"
+#line 3574 "page.c"
 	}
 }
 
@@ -3563,7 +3595,7 @@ gboolean page_get_is_landscape (Page* self) {
 	result = _tmp1_ > _tmp3_;
 #line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3567 "page.c"
+#line 3599 "page.c"
 }
 
 
@@ -3578,7 +3610,7 @@ gint page_get_dpi (Page* self) {
 	result = _tmp0_;
 #line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3582 "page.c"
+#line 3614 "page.c"
 }
 
 
@@ -3590,7 +3622,7 @@ static void page_set_dpi (Page* self, gint value) {
 	_tmp0_ = value;
 #line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_dpi = _tmp0_;
-#line 3594 "page.c"
+#line 3626 "page.c"
 }
 
 
@@ -3605,7 +3637,7 @@ gint page_get_depth (Page* self) {
 	result = _tmp0_;
 #line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3609 "page.c"
+#line 3641 "page.c"
 }
 
 
@@ -3617,7 +3649,7 @@ static void page_set_depth (Page* self, gint value) {
 	_tmp0_ = value;
 #line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_depth = _tmp0_;
-#line 3621 "page.c"
+#line 3653 "page.c"
 }
 
 
@@ -3632,7 +3664,7 @@ const gchar* page_get_color_profile (Page* self) {
 	result = _tmp0_;
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3636 "page.c"
+#line 3668 "page.c"
 }
 
 
@@ -3649,7 +3681,7 @@ void page_set_color_profile (Page* self, const gchar* value) {
 	_g_free0 (self->priv->_color_profile);
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_color_profile = _tmp1_;
-#line 3653 "page.c"
+#line 3685 "page.c"
 }
 
 
@@ -3664,7 +3696,7 @@ gint page_get_scan_width (Page* self) {
 	result = _tmp0_;
 #line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3668 "page.c"
+#line 3700 "page.c"
 }
 
 
@@ -3676,7 +3708,7 @@ static void page_set_scan_width (Page* self, gint value) {
 	_tmp0_ = value;
 #line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_scan_width = _tmp0_;
-#line 3680 "page.c"
+#line 3712 "page.c"
 }
 
 
@@ -3691,7 +3723,7 @@ gint page_get_scan_height (Page* self) {
 	result = _tmp0_;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3695 "page.c"
+#line 3727 "page.c"
 }
 
 
@@ -3703,7 +3735,7 @@ static void page_set_scan_height (Page* self, gint value) {
 	_tmp0_ = value;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_scan_height = _tmp0_;
-#line 3707 "page.c"
+#line 3739 "page.c"
 }
 
 
@@ -3718,7 +3750,7 @@ gint page_get_rowstride (Page* self) {
 	result = _tmp0_;
 #line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3722 "page.c"
+#line 3754 "page.c"
 }
 
 
@@ -3730,7 +3762,7 @@ static void page_set_rowstride (Page* self, gint value) {
 	_tmp0_ = value;
 #line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_rowstride = _tmp0_;
-#line 3734 "page.c"
+#line 3766 "page.c"
 }
 
 
@@ -3745,7 +3777,7 @@ gint page_get_n_channels (Page* self) {
 	result = _tmp0_;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3749 "page.c"
+#line 3781 "page.c"
 }
 
 
@@ -3757,7 +3789,7 @@ static void page_set_n_channels (Page* self, gint value) {
 	_tmp0_ = value;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_n_channels = _tmp0_;
-#line 3761 "page.c"
+#line 3793 "page.c"
 }
 
 
@@ -3772,7 +3804,7 @@ gboolean page_get_is_scanning (Page* self) {
 	result = _tmp0_;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3776 "page.c"
+#line 3808 "page.c"
 }
 
 
@@ -3784,7 +3816,7 @@ static void page_set_is_scanning (Page* self, gboolean value) {
 	_tmp0_ = value;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_is_scanning = _tmp0_;
-#line 3788 "page.c"
+#line 3820 "page.c"
 }
 
 
@@ -3799,7 +3831,7 @@ gboolean page_get_has_data (Page* self) {
 	result = _tmp0_;
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3803 "page.c"
+#line 3835 "page.c"
 }
 
 
@@ -3811,7 +3843,7 @@ static void page_set_has_data (Page* self, gboolean value) {
 	_tmp0_ = value;
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_has_data = _tmp0_;
-#line 3815 "page.c"
+#line 3847 "page.c"
 }
 
 
@@ -3826,7 +3858,7 @@ gint page_get_scan_line (Page* self) {
 	result = _tmp0_;
 #line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3830 "page.c"
+#line 3862 "page.c"
 }
 
 
@@ -3838,7 +3870,7 @@ static void page_set_scan_line (Page* self, gint value) {
 	_tmp0_ = value;
 #line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_scan_line = _tmp0_;
-#line 3842 "page.c"
+#line 3874 "page.c"
 }
 
 
@@ -3853,7 +3885,7 @@ gboolean page_get_is_color (Page* self) {
 	result = _tmp0_ > 1;
 #line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3857 "page.c"
+#line 3889 "page.c"
 }
 
 
@@ -3868,7 +3900,7 @@ ScanDirection page_get_scan_direction (Page* self) {
 	result = _tmp0_;
 #line 92 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3872 "page.c"
+#line 3904 "page.c"
 }
 
 
@@ -3895,7 +3927,7 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 	if (_tmp0_ == _tmp1_) {
 #line 97 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
-#line 3899 "page.c"
+#line 3931 "page.c"
 	}
 #line 100 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	size_has_changed = FALSE;
@@ -3909,13 +3941,13 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 	_tmp4_ = left_steps;
 #line 102 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp4_ < 0) {
-#line 3913 "page.c"
+#line 3945 "page.c"
 		gint _tmp5_ = 0;
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = left_steps;
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		left_steps = _tmp5_ + 4;
-#line 3919 "page.c"
+#line 3951 "page.c"
 	}
 #line 104 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp6_ = left_steps;
@@ -3923,13 +3955,13 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 	if (_tmp6_ != 2) {
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		size_has_changed = TRUE;
-#line 3927 "page.c"
+#line 3959 "page.c"
 	}
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = self->priv->_has_crop;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp7_) {
-#line 3933 "page.c"
+#line 3965 "page.c"
 		gint _tmp8_ = 0;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp8_ = left_steps;
@@ -3937,7 +3969,7 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 		switch (_tmp8_) {
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			case 1:
-#line 3941 "page.c"
+#line 3973 "page.c"
 			{
 				gint t = 0;
 				gint _tmp9_ = 0;
@@ -3981,11 +4013,11 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 				page_set_crop_height (self, _tmp17_);
 #line 120 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 3985 "page.c"
+#line 4017 "page.c"
 			}
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			case 2:
-#line 3989 "page.c"
+#line 4021 "page.c"
 			{
 				gint _tmp18_ = 0;
 				gint _tmp19_ = 0;
@@ -4017,11 +4049,11 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 				page_set_crop_y (self, _tmp23_ - (_tmp24_ + _tmp25_));
 #line 125 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 4021 "page.c"
+#line 4053 "page.c"
 			}
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			case 3:
-#line 4025 "page.c"
+#line 4057 "page.c"
 			{
 				gint t = 0;
 				gint _tmp26_ = 0;
@@ -4065,12 +4097,12 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 				page_set_crop_height (self, _tmp34_);
 #line 134 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 4069 "page.c"
+#line 4101 "page.c"
 			}
 			default:
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 4074 "page.c"
+#line 4106 "page.c"
 		}
 	}
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -4083,7 +4115,7 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 	if (_tmp36_) {
 #line 140 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_signal_emit_by_name (self, "size-changed");
-#line 4087 "page.c"
+#line 4119 "page.c"
 	}
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-direction-changed");
@@ -4093,7 +4125,7 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 	if (_tmp37_) {
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_signal_emit_by_name (self, "crop-changed");
-#line 4097 "page.c"
+#line 4129 "page.c"
 	}
 }
 
@@ -4109,7 +4141,7 @@ gboolean page_get_has_crop (Page* self) {
 	result = _tmp0_;
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4113 "page.c"
+#line 4145 "page.c"
 }
 
 
@@ -4121,7 +4153,7 @@ static void page_set_has_crop (Page* self, gboolean value) {
 	_tmp0_ = value;
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_has_crop = _tmp0_;
-#line 4125 "page.c"
+#line 4157 "page.c"
 }
 
 
@@ -4136,7 +4168,7 @@ const gchar* page_get_crop_name (Page* self) {
 	result = _tmp0_;
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4140 "page.c"
+#line 4172 "page.c"
 }
 
 
@@ -4153,7 +4185,7 @@ static void page_set_crop_name (Page* self, const gchar* value) {
 	_g_free0 (self->priv->_crop_name);
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_crop_name = _tmp1_;
-#line 4157 "page.c"
+#line 4189 "page.c"
 }
 
 
@@ -4168,7 +4200,7 @@ gint page_get_crop_x (Page* self) {
 	result = _tmp0_;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4172 "page.c"
+#line 4204 "page.c"
 }
 
 
@@ -4180,7 +4212,7 @@ static void page_set_crop_x (Page* self, gint value) {
 	_tmp0_ = value;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_crop_x = _tmp0_;
-#line 4184 "page.c"
+#line 4216 "page.c"
 }
 
 
@@ -4195,7 +4227,7 @@ gint page_get_crop_y (Page* self) {
 	result = _tmp0_;
 #line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4199 "page.c"
+#line 4231 "page.c"
 }
 
 
@@ -4207,7 +4239,7 @@ static void page_set_crop_y (Page* self, gint value) {
 	_tmp0_ = value;
 #line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_crop_y = _tmp0_;
-#line 4211 "page.c"
+#line 4243 "page.c"
 }
 
 
@@ -4222,7 +4254,7 @@ gint page_get_crop_width (Page* self) {
 	result = _tmp0_;
 #line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4226 "page.c"
+#line 4258 "page.c"
 }
 
 
@@ -4234,7 +4266,7 @@ static void page_set_crop_width (Page* self, gint value) {
 	_tmp0_ = value;
 #line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_crop_width = _tmp0_;
-#line 4238 "page.c"
+#line 4270 "page.c"
 }
 
 
@@ -4249,7 +4281,7 @@ gint page_get_crop_height (Page* self) {
 	result = _tmp0_;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4253 "page.c"
+#line 4285 "page.c"
 }
 
 
@@ -4261,14 +4293,14 @@ static void page_set_crop_height (Page* self, gint value) {
 	_tmp0_ = value;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_crop_height = _tmp0_;
-#line 4265 "page.c"
+#line 4297 "page.c"
 }
 
 
 static void value_page_init (GValue* value) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	value->data[0].v_pointer = NULL;
-#line 4272 "page.c"
+#line 4304 "page.c"
 }
 
 
@@ -4277,7 +4309,7 @@ static void value_page_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_unref (value->data[0].v_pointer);
-#line 4281 "page.c"
+#line 4313 "page.c"
 	}
 }
 
@@ -4287,11 +4319,11 @@ static void value_page_copy_value (const GValue* src_value, GValue* dest_value)
 	if (src_value->data[0].v_pointer) {
 #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"
+#line 4323 "page.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4295 "page.c"
+#line 4327 "page.c"
 	}
 }
 
@@ -4299,37 +4331,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/trunk/src/page.vala"
 	return value->data[0].v_pointer;
-#line 4303 "page.c"
+#line 4335 "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/trunk/src/page.vala"
 	if (collect_values[0].v_pointer) {
-#line 4310 "page.c"
+#line 4342 "page.c"
 		Page* object;
 		object = collect_values[0].v_pointer;
 #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/trunk/src/page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4317 "page.c"
+#line 4349 "page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/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 4353 "page.c"
 		}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = page_ref (object);
-#line 4325 "page.c"
+#line 4357 "page.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4329 "page.c"
+#line 4361 "page.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
-#line 4333 "page.c"
+#line 4365 "page.c"
 }
 
 
@@ -4340,25 +4372,25 @@ static gchar* value_page_lcopy_value (const GValue* value, guint n_collect_value
 	if (!object_p) {
 #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 4376 "page.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!value->data[0].v_pointer) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = NULL;
-#line 4350 "page.c"
+#line 4382 "page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4354 "page.c"
+#line 4386 "page.c"
 	} else {
 #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 4390 "page.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
-#line 4362 "page.c"
+#line 4394 "page.c"
 }
 
 
@@ -4372,7 +4404,7 @@ GParamSpec* param_spec_page (const gchar* name, const gchar* nick, const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return G_PARAM_SPEC (spec);
-#line 4376 "page.c"
+#line 4408 "page.c"
 }
 
 
@@ -4381,7 +4413,7 @@ gpointer value_get_page (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE), NULL);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
-#line 4385 "page.c"
+#line 4417 "page.c"
 }
 
 
@@ -4401,17 +4433,17 @@ void value_set_page (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_ref (value->data[0].v_pointer);
-#line 4405 "page.c"
+#line 4437 "page.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4409 "page.c"
+#line 4441 "page.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_unref (old);
-#line 4415 "page.c"
+#line 4447 "page.c"
 	}
 }
 
@@ -4430,17 +4462,17 @@ void value_take_page (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = v_object;
-#line 4434 "page.c"
+#line 4466 "page.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4438 "page.c"
+#line 4470 "page.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_unref (old);
-#line 4444 "page.c"
+#line 4476 "page.c"
 	}
 }
 
@@ -4464,7 +4496,7 @@ static void page_class_init (PageClass * klass) {
 	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/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"
+#line 4500 "page.c"
 }
 
 
@@ -4473,7 +4505,7 @@ static void page_instance_init (Page * self) {
 	self->priv = PAGE_GET_PRIVATE (self);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->ref_count = 1;
-#line 4477 "page.c"
+#line 4509 "page.c"
 }
 
 
@@ -4489,7 +4521,7 @@ static void page_finalize (Page* obj) {
 	self->priv->pixels = (g_free (self->priv->pixels), NULL);
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (self->priv->_crop_name);
-#line 4493 "page.c"
+#line 4525 "page.c"
 }
 
 
@@ -4514,7 +4546,7 @@ gpointer page_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return instance;
-#line 4518 "page.c"
+#line 4550 "page.c"
 }
 
 
@@ -4527,7 +4559,7 @@ void page_unref (gpointer instance) {
 		PAGE_GET_CLASS (self)->finalize (self);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4531 "page.c"
+#line 4563 "page.c"
 	}
 }
 
@@ -4550,14 +4582,14 @@ PixbufWriter* pixbuf_writer_construct (GType object_type, GFileOutputStream* str
 	self->stream = _tmp1_;
 #line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return self;
-#line 4554 "page.c"
+#line 4586 "page.c"
 }
 
 
 PixbufWriter* pixbuf_writer_new (GFileOutputStream* stream) {
 #line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return pixbuf_writer_construct (TYPE_PIXBUF_WRITER, stream);
-#line 4561 "page.c"
+#line 4593 "page.c"
 }
 
 
@@ -4566,7 +4598,7 @@ static gboolean _pixbuf_writer_write_pixbuf_data_gdk_pixbuf_save_func (guint8* b
 	result = pixbuf_writer_write_pixbuf_data ((PixbufWriter*) self, buf, buf_length1, error);
 #line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4570 "page.c"
+#line 4602 "page.c"
 }
 
 
@@ -4604,7 +4636,7 @@ void pixbuf_writer_save (PixbufWriter* self, GdkPixbuf* image, const gchar* type
 		g_propagate_error (error, _inner_error_);
 #line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
-#line 4608 "page.c"
+#line 4640 "page.c"
 	}
 }
 
@@ -4631,20 +4663,20 @@ static gboolean pixbuf_writer_write_pixbuf_data (PixbufWriter* self, guint8* buf
 		g_propagate_error (error, _inner_error_);
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return FALSE;
-#line 4635 "page.c"
+#line 4667 "page.c"
 	}
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = TRUE;
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4641 "page.c"
+#line 4673 "page.c"
 }
 
 
 static void value_pixbuf_writer_init (GValue* value) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	value->data[0].v_pointer = NULL;
-#line 4648 "page.c"
+#line 4680 "page.c"
 }
 
 
@@ -4653,7 +4685,7 @@ static void value_pixbuf_writer_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (value->data[0].v_pointer);
-#line 4657 "page.c"
+#line 4689 "page.c"
 	}
 }
 
@@ -4663,11 +4695,11 @@ static void value_pixbuf_writer_copy_value (const GValue* src_value, GValue* des
 	if (src_value->data[0].v_pointer) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = pixbuf_writer_ref (src_value->data[0].v_pointer);
-#line 4667 "page.c"
+#line 4699 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4671 "page.c"
+#line 4703 "page.c"
 	}
 }
 
@@ -4675,37 +4707,37 @@ static void value_pixbuf_writer_copy_value (const GValue* src_value, GValue* des
 static gpointer value_pixbuf_writer_peek_pointer (const GValue* value) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
-#line 4679 "page.c"
+#line 4711 "page.c"
 }
 
 
 static gchar* value_pixbuf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (collect_values[0].v_pointer) {
-#line 4686 "page.c"
+#line 4718 "page.c"
 		PixbufWriter* object;
 		object = collect_values[0].v_pointer;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4693 "page.c"
+#line 4725 "page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4697 "page.c"
+#line 4729 "page.c"
 		}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = pixbuf_writer_ref (object);
-#line 4701 "page.c"
+#line 4733 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4705 "page.c"
+#line 4737 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
-#line 4709 "page.c"
+#line 4741 "page.c"
 }
 
 
@@ -4716,25 +4748,25 @@ static gchar* value_pixbuf_writer_lcopy_value (const GValue* value, guint n_coll
 	if (!object_p) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4720 "page.c"
+#line 4752 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!value->data[0].v_pointer) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = NULL;
-#line 4726 "page.c"
+#line 4758 "page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4730 "page.c"
+#line 4762 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = pixbuf_writer_ref (value->data[0].v_pointer);
-#line 4734 "page.c"
+#line 4766 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
-#line 4738 "page.c"
+#line 4770 "page.c"
 }
 
 
@@ -4748,7 +4780,7 @@ GParamSpec* param_spec_pixbuf_writer (const gchar* name, const gchar* nick, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return G_PARAM_SPEC (spec);
-#line 4752 "page.c"
+#line 4784 "page.c"
 }
 
 
@@ -4757,7 +4789,7 @@ gpointer value_get_pixbuf_writer (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXBUF_WRITER), NULL);
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
-#line 4761 "page.c"
+#line 4793 "page.c"
 }
 
 
@@ -4777,17 +4809,17 @@ void value_set_pixbuf_writer (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_ref (value->data[0].v_pointer);
-#line 4781 "page.c"
+#line 4813 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4785 "page.c"
+#line 4817 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (old);
-#line 4791 "page.c"
+#line 4823 "page.c"
 	}
 }
 
@@ -4806,17 +4838,17 @@ void value_take_pixbuf_writer (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = v_object;
-#line 4810 "page.c"
+#line 4842 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4814 "page.c"
+#line 4846 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (old);
-#line 4820 "page.c"
+#line 4852 "page.c"
 	}
 }
 
@@ -4826,14 +4858,14 @@ static void pixbuf_writer_class_init (PixbufWriterClass * klass) {
 	pixbuf_writer_parent_class = g_type_class_peek_parent (klass);
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	((PixbufWriterClass *) klass)->finalize = pixbuf_writer_finalize;
-#line 4830 "page.c"
+#line 4862 "page.c"
 }
 
 
 static void pixbuf_writer_instance_init (PixbufWriter * self) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->ref_count = 1;
-#line 4837 "page.c"
+#line 4869 "page.c"
 }
 
 
@@ -4845,7 +4877,7 @@ static void pixbuf_writer_finalize (PixbufWriter* obj) {
 	g_signal_handlers_destroy (self);
 #line 694 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (self->stream);
-#line 4849 "page.c"
+#line 4881 "page.c"
 }
 
 
@@ -4870,7 +4902,7 @@ gpointer pixbuf_writer_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return instance;
-#line 4874 "page.c"
+#line 4906 "page.c"
 }
 
 
@@ -4883,7 +4915,7 @@ void pixbuf_writer_unref (gpointer instance) {
 		PIXBUF_WRITER_GET_CLASS (self)->finalize (self);
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4887 "page.c"
+#line 4919 "page.c"
 	}
 }
 
diff --git a/src/page.vala b/src/page.vala
index 7a086cd..a786f50 100644
--- a/src/page.vala
+++ b/src/page.vala
@@ -685,7 +685,7 @@ public class Page
             writer.save (image, "tiff", keys, values);
         }
         else
-            ; // FIXME: Throw Error
+            throw new FileError.INVAL ("Unknown file type: %s".printf (type));
     }
 }
 
diff --git a/src/sane.vapi b/src/sane.vapi
index aa3d90c..f636dac 100644
--- a/src/sane.vapi
+++ b/src/sane.vapi
@@ -195,7 +195,7 @@ namespace Sane {
         public Int cap;
 
         public ConstraintType constraint_type;
-        [CCode (cname = "constraint.string_list", array_length = false, null_terminated = true)]
+        [CCode (cname = "constraint.string_list", array_length = false, array_null_terminated = true)]
         public string[] string_list;
         [CCode (cname = "constraint.word_list", array_length = false)]
         public Word[] word_list;
diff --git a/src/scanner.c b/src/scanner.c
index d32dcd9..2d28a84 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -1,4 +1,4 @@
-/* scanner.c generated by valac 0.26.2, the Vala compiler
+/* scanner.c generated by valac 0.28.0, the Vala compiler
  * generated from scanner.vala, do not modify */
 
 /*
@@ -973,6 +973,7 @@ static void g_cclosure_user_marshal_VOID__INT_STRING (GClosure * closure, GValue
 static void scanner_finalize (Scanner* obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static gint _vala_array_length (gpointer array);
 
 
 ScanDevice* scan_device_construct (GType object_type) {
@@ -981,21 +982,21 @@ ScanDevice* scan_device_construct (GType object_type) {
 	self = (ScanDevice*) g_type_create_instance (object_type);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 985 "scanner.c"
+#line 986 "scanner.c"
 }
 
 
 ScanDevice* scan_device_new (void) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_device_construct (TYPE_SCAN_DEVICE);
-#line 992 "scanner.c"
+#line 993 "scanner.c"
 }
 
 
 static void value_scan_device_init (GValue* value) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 999 "scanner.c"
+#line 1000 "scanner.c"
 }
 
 
@@ -1004,7 +1005,7 @@ static void value_scan_device_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (value->data[0].v_pointer);
-#line 1008 "scanner.c"
+#line 1009 "scanner.c"
 	}
 }
 
@@ -1014,11 +1015,11 @@ static void value_scan_device_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_device_ref (src_value->data[0].v_pointer);
-#line 1018 "scanner.c"
+#line 1019 "scanner.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1022 "scanner.c"
+#line 1023 "scanner.c"
 	}
 }
 
@@ -1026,37 +1027,37 @@ static void value_scan_device_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_scan_device_peek_pointer (const GValue* value) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1030 "scanner.c"
+#line 1031 "scanner.c"
 }
 
 
 static gchar* value_scan_device_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 1037 "scanner.c"
+#line 1038 "scanner.c"
 		ScanDevice* object;
 		object = collect_values[0].v_pointer;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1044 "scanner.c"
+#line 1045 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1048 "scanner.c"
+#line 1049 "scanner.c"
 		}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_device_ref (object);
-#line 1052 "scanner.c"
+#line 1053 "scanner.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1056 "scanner.c"
+#line 1057 "scanner.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1060 "scanner.c"
+#line 1061 "scanner.c"
 }
 
 
@@ -1067,25 +1068,25 @@ static gchar* value_scan_device_lcopy_value (const GValue* value, guint n_collec
 	if (!object_p) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1071 "scanner.c"
+#line 1072 "scanner.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 1077 "scanner.c"
+#line 1078 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1081 "scanner.c"
+#line 1082 "scanner.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_device_ref (value->data[0].v_pointer);
-#line 1085 "scanner.c"
+#line 1086 "scanner.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1089 "scanner.c"
+#line 1090 "scanner.c"
 }
 
 
@@ -1099,7 +1100,7 @@ GParamSpec* param_spec_scan_device (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 1103 "scanner.c"
+#line 1104 "scanner.c"
 }
 
 
@@ -1108,7 +1109,7 @@ gpointer value_get_scan_device (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_DEVICE), NULL);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1112 "scanner.c"
+#line 1113 "scanner.c"
 }
 
 
@@ -1128,17 +1129,17 @@ void value_set_scan_device (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_ref (value->data[0].v_pointer);
-#line 1132 "scanner.c"
+#line 1133 "scanner.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1136 "scanner.c"
+#line 1137 "scanner.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (old);
-#line 1142 "scanner.c"
+#line 1143 "scanner.c"
 	}
 }
 
@@ -1157,17 +1158,17 @@ void value_take_scan_device (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 1161 "scanner.c"
+#line 1162 "scanner.c"
 	} else {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1165 "scanner.c"
+#line 1166 "scanner.c"
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_device_unref (old);
-#line 1171 "scanner.c"
+#line 1172 "scanner.c"
 	}
 }
 
@@ -1177,14 +1178,14 @@ static void scan_device_class_init (ScanDeviceClass * klass) {
 	scan_device_parent_class = g_type_class_peek_parent (klass);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((ScanDeviceClass *) klass)->finalize = scan_device_finalize;
-#line 1181 "scanner.c"
+#line 1182 "scanner.c"
 }
 
 
 static void scan_device_instance_init (ScanDevice * self) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 1188 "scanner.c"
+#line 1189 "scanner.c"
 }
 
 
@@ -1198,7 +1199,7 @@ static void scan_device_finalize (ScanDevice* obj) {
 	_g_free0 (self->name);
 #line 17 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->label);
-#line 1202 "scanner.c"
+#line 1203 "scanner.c"
 }
 
 
@@ -1223,7 +1224,7 @@ gpointer scan_device_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 1227 "scanner.c"
+#line 1228 "scanner.c"
 }
 
 
@@ -1236,7 +1237,7 @@ void scan_device_unref (gpointer instance) {
 		SCAN_DEVICE_GET_CLASS (self)->finalize (self);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1240 "scanner.c"
+#line 1241 "scanner.c"
 	}
 }
 
@@ -1247,21 +1248,21 @@ ScanPageInfo* scan_page_info_construct (GType object_type) {
 	self = (ScanPageInfo*) g_type_create_instance (object_type);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 1251 "scanner.c"
+#line 1252 "scanner.c"
 }
 
 
 ScanPageInfo* scan_page_info_new (void) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_page_info_construct (TYPE_SCAN_PAGE_INFO);
-#line 1258 "scanner.c"
+#line 1259 "scanner.c"
 }
 
 
 static void value_scan_page_info_init (GValue* value) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 1265 "scanner.c"
+#line 1266 "scanner.c"
 }
 
 
@@ -1270,7 +1271,7 @@ static void value_scan_page_info_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (value->data[0].v_pointer);
-#line 1274 "scanner.c"
+#line 1275 "scanner.c"
 	}
 }
 
@@ -1280,11 +1281,11 @@ static void value_scan_page_info_copy_value (const GValue* src_value, GValue* de
 	if (src_value->data[0].v_pointer) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_page_info_ref (src_value->data[0].v_pointer);
-#line 1284 "scanner.c"
+#line 1285 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1288 "scanner.c"
+#line 1289 "scanner.c"
 	}
 }
 
@@ -1292,37 +1293,37 @@ static void value_scan_page_info_copy_value (const GValue* src_value, GValue* de
 static gpointer value_scan_page_info_peek_pointer (const GValue* value) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1296 "scanner.c"
+#line 1297 "scanner.c"
 }
 
 
 static gchar* value_scan_page_info_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 1303 "scanner.c"
+#line 1304 "scanner.c"
 		ScanPageInfo* object;
 		object = collect_values[0].v_pointer;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1310 "scanner.c"
+#line 1311 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1314 "scanner.c"
+#line 1315 "scanner.c"
 		}
 #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"
+#line 1319 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1322 "scanner.c"
+#line 1323 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1326 "scanner.c"
+#line 1327 "scanner.c"
 }
 
 
@@ -1333,25 +1334,25 @@ static gchar* value_scan_page_info_lcopy_value (const GValue* value, guint n_col
 	if (!object_p) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1337 "scanner.c"
+#line 1338 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 1343 "scanner.c"
+#line 1344 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1347 "scanner.c"
+#line 1348 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_page_info_ref (value->data[0].v_pointer);
-#line 1351 "scanner.c"
+#line 1352 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1355 "scanner.c"
+#line 1356 "scanner.c"
 }
 
 
@@ -1365,7 +1366,7 @@ GParamSpec* param_spec_scan_page_info (const gchar* name, const gchar* nick, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 1369 "scanner.c"
+#line 1370 "scanner.c"
 }
 
 
@@ -1374,7 +1375,7 @@ gpointer value_get_scan_page_info (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_PAGE_INFO), NULL);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1378 "scanner.c"
+#line 1379 "scanner.c"
 }
 
 
@@ -1394,17 +1395,17 @@ void value_set_scan_page_info (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_ref (value->data[0].v_pointer);
-#line 1398 "scanner.c"
+#line 1399 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1402 "scanner.c"
+#line 1403 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (old);
-#line 1408 "scanner.c"
+#line 1409 "scanner.c"
 	}
 }
 
@@ -1423,17 +1424,17 @@ void value_take_scan_page_info (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 1427 "scanner.c"
+#line 1428 "scanner.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1431 "scanner.c"
+#line 1432 "scanner.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_page_info_unref (old);
-#line 1437 "scanner.c"
+#line 1438 "scanner.c"
 	}
 }
 
@@ -1443,14 +1444,14 @@ static void scan_page_info_class_init (ScanPageInfoClass * klass) {
 	scan_page_info_parent_class = g_type_class_peek_parent (klass);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((ScanPageInfoClass *) klass)->finalize = scan_page_info_finalize;
-#line 1447 "scanner.c"
+#line 1448 "scanner.c"
 }
 
 
 static void scan_page_info_instance_init (ScanPageInfo * self) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 1454 "scanner.c"
+#line 1455 "scanner.c"
 }
 
 
@@ -1462,7 +1463,7 @@ static void scan_page_info_finalize (ScanPageInfo* obj) {
 	g_signal_handlers_destroy (self);
 #line 36 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->device);
-#line 1466 "scanner.c"
+#line 1467 "scanner.c"
 }
 
 
@@ -1487,7 +1488,7 @@ gpointer scan_page_info_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 1491 "scanner.c"
+#line 1492 "scanner.c"
 }
 
 
@@ -1500,7 +1501,7 @@ void scan_page_info_unref (gpointer instance) {
 		SCAN_PAGE_INFO_GET_CLASS (self)->finalize (self);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1504 "scanner.c"
+#line 1505 "scanner.c"
 	}
 }
 
@@ -1511,21 +1512,21 @@ ScanLine* scan_line_construct (GType object_type) {
 	self = (ScanLine*) g_type_create_instance (object_type);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 1515 "scanner.c"
+#line 1516 "scanner.c"
 }
 
 
 ScanLine* scan_line_new (void) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_line_construct (TYPE_SCAN_LINE);
-#line 1522 "scanner.c"
+#line 1523 "scanner.c"
 }
 
 
 static void value_scan_line_init (GValue* value) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 1529 "scanner.c"
+#line 1530 "scanner.c"
 }
 
 
@@ -1534,7 +1535,7 @@ static void value_scan_line_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (value->data[0].v_pointer);
-#line 1538 "scanner.c"
+#line 1539 "scanner.c"
 	}
 }
 
@@ -1544,11 +1545,11 @@ static void value_scan_line_copy_value (const GValue* src_value, GValue* dest_va
 	if (src_value->data[0].v_pointer) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_line_ref (src_value->data[0].v_pointer);
-#line 1548 "scanner.c"
+#line 1549 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1552 "scanner.c"
+#line 1553 "scanner.c"
 	}
 }
 
@@ -1556,37 +1557,37 @@ static void value_scan_line_copy_value (const GValue* src_value, GValue* dest_va
 static gpointer value_scan_line_peek_pointer (const GValue* value) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1560 "scanner.c"
+#line 1561 "scanner.c"
 }
 
 
 static gchar* value_scan_line_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 1567 "scanner.c"
+#line 1568 "scanner.c"
 		ScanLine* object;
 		object = collect_values[0].v_pointer;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1574 "scanner.c"
+#line 1575 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1578 "scanner.c"
+#line 1579 "scanner.c"
 		}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_line_ref (object);
-#line 1582 "scanner.c"
+#line 1583 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1586 "scanner.c"
+#line 1587 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1590 "scanner.c"
+#line 1591 "scanner.c"
 }
 
 
@@ -1597,25 +1598,25 @@ static gchar* value_scan_line_lcopy_value (const GValue* value, guint n_collect_
 	if (!object_p) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1601 "scanner.c"
+#line 1602 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 1607 "scanner.c"
+#line 1608 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1611 "scanner.c"
+#line 1612 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_line_ref (value->data[0].v_pointer);
-#line 1615 "scanner.c"
+#line 1616 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1619 "scanner.c"
+#line 1620 "scanner.c"
 }
 
 
@@ -1629,7 +1630,7 @@ GParamSpec* param_spec_scan_line (const gchar* name, const gchar* nick, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 1633 "scanner.c"
+#line 1634 "scanner.c"
 }
 
 
@@ -1638,7 +1639,7 @@ gpointer value_get_scan_line (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_LINE), NULL);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1642 "scanner.c"
+#line 1643 "scanner.c"
 }
 
 
@@ -1658,17 +1659,17 @@ void value_set_scan_line (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_ref (value->data[0].v_pointer);
-#line 1662 "scanner.c"
+#line 1663 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1666 "scanner.c"
+#line 1667 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (old);
-#line 1672 "scanner.c"
+#line 1673 "scanner.c"
 	}
 }
 
@@ -1687,17 +1688,17 @@ void value_take_scan_line (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 1691 "scanner.c"
+#line 1692 "scanner.c"
 	} else {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1695 "scanner.c"
+#line 1696 "scanner.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_line_unref (old);
-#line 1701 "scanner.c"
+#line 1702 "scanner.c"
 	}
 }
 
@@ -1707,14 +1708,14 @@ static void scan_line_class_init (ScanLineClass * klass) {
 	scan_line_parent_class = g_type_class_peek_parent (klass);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((ScanLineClass *) klass)->finalize = scan_line_finalize;
-#line 1711 "scanner.c"
+#line 1712 "scanner.c"
 }
 
 
 static void scan_line_instance_init (ScanLine * self) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 1718 "scanner.c"
+#line 1719 "scanner.c"
 }
 
 
@@ -1726,7 +1727,7 @@ static void scan_line_finalize (ScanLine* obj) {
 	g_signal_handlers_destroy (self);
 #line 55 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->data = (g_free (self->data), NULL);
-#line 1730 "scanner.c"
+#line 1731 "scanner.c"
 }
 
 
@@ -1751,7 +1752,7 @@ gpointer scan_line_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 1755 "scanner.c"
+#line 1756 "scanner.c"
 }
 
 
@@ -1764,7 +1765,7 @@ void scan_line_unref (gpointer instance) {
 		SCAN_LINE_GET_CLASS (self)->finalize (self);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1768 "scanner.c"
+#line 1769 "scanner.c"
 	}
 }
 
@@ -1799,21 +1800,21 @@ ScanOptions* scan_options_construct (GType object_type) {
 	self = (ScanOptions*) g_type_create_instance (object_type);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 1803 "scanner.c"
+#line 1804 "scanner.c"
 }
 
 
 ScanOptions* scan_options_new (void) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_options_construct (TYPE_SCAN_OPTIONS);
-#line 1810 "scanner.c"
+#line 1811 "scanner.c"
 }
 
 
 static void value_scan_options_init (GValue* value) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 1817 "scanner.c"
+#line 1818 "scanner.c"
 }
 
 
@@ -1822,7 +1823,7 @@ static void value_scan_options_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (value->data[0].v_pointer);
-#line 1826 "scanner.c"
+#line 1827 "scanner.c"
 	}
 }
 
@@ -1832,11 +1833,11 @@ static void value_scan_options_copy_value (const GValue* src_value, GValue* dest
 	if (src_value->data[0].v_pointer) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_options_ref (src_value->data[0].v_pointer);
-#line 1836 "scanner.c"
+#line 1837 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1840 "scanner.c"
+#line 1841 "scanner.c"
 	}
 }
 
@@ -1844,37 +1845,37 @@ static void value_scan_options_copy_value (const GValue* src_value, GValue* dest
 static gpointer value_scan_options_peek_pointer (const GValue* value) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1848 "scanner.c"
+#line 1849 "scanner.c"
 }
 
 
 static gchar* value_scan_options_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 1855 "scanner.c"
+#line 1856 "scanner.c"
 		ScanOptions* object;
 		object = collect_values[0].v_pointer;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1862 "scanner.c"
+#line 1863 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1866 "scanner.c"
+#line 1867 "scanner.c"
 		}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_options_ref (object);
-#line 1870 "scanner.c"
+#line 1871 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1874 "scanner.c"
+#line 1875 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1878 "scanner.c"
+#line 1879 "scanner.c"
 }
 
 
@@ -1885,25 +1886,25 @@ static gchar* value_scan_options_lcopy_value (const GValue* value, guint n_colle
 	if (!object_p) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1889 "scanner.c"
+#line 1890 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 1895 "scanner.c"
+#line 1896 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1899 "scanner.c"
+#line 1900 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_options_ref (value->data[0].v_pointer);
-#line 1903 "scanner.c"
+#line 1904 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 1907 "scanner.c"
+#line 1908 "scanner.c"
 }
 
 
@@ -1917,7 +1918,7 @@ GParamSpec* param_spec_scan_options (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 1921 "scanner.c"
+#line 1922 "scanner.c"
 }
 
 
@@ -1926,7 +1927,7 @@ gpointer value_get_scan_options (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_OPTIONS), NULL);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 1930 "scanner.c"
+#line 1931 "scanner.c"
 }
 
 
@@ -1946,17 +1947,17 @@ void value_set_scan_options (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_ref (value->data[0].v_pointer);
-#line 1950 "scanner.c"
+#line 1951 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1954 "scanner.c"
+#line 1955 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (old);
-#line 1960 "scanner.c"
+#line 1961 "scanner.c"
 	}
 }
 
@@ -1975,17 +1976,17 @@ void value_take_scan_options (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 1979 "scanner.c"
+#line 1980 "scanner.c"
 	} else {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 1983 "scanner.c"
+#line 1984 "scanner.c"
 	}
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_options_unref (old);
-#line 1989 "scanner.c"
+#line 1990 "scanner.c"
 	}
 }
 
@@ -1995,14 +1996,14 @@ static void scan_options_class_init (ScanOptionsClass * klass) {
 	scan_options_parent_class = g_type_class_peek_parent (klass);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((ScanOptionsClass *) klass)->finalize = scan_options_finalize;
-#line 1999 "scanner.c"
+#line 2000 "scanner.c"
 }
 
 
 static void scan_options_instance_init (ScanOptions * self) {
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 2006 "scanner.c"
+#line 2007 "scanner.c"
 }
 
 
@@ -2012,7 +2013,7 @@ static void scan_options_finalize (ScanOptions* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SCAN_OPTIONS, ScanOptions);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
-#line 2016 "scanner.c"
+#line 2017 "scanner.c"
 }
 
 
@@ -2037,7 +2038,7 @@ gpointer scan_options_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 2041 "scanner.c"
+#line 2042 "scanner.c"
 }
 
 
@@ -2050,7 +2051,7 @@ void scan_options_unref (gpointer instance) {
 		SCAN_OPTIONS_GET_CLASS (self)->finalize (self);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2054 "scanner.c"
+#line 2055 "scanner.c"
 	}
 }
 
@@ -2061,21 +2062,21 @@ ScanJob* scan_job_construct (GType object_type) {
 	self = (ScanJob*) g_type_create_instance (object_type);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2065 "scanner.c"
+#line 2066 "scanner.c"
 }
 
 
 ScanJob* scan_job_new (void) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scan_job_construct (TYPE_SCAN_JOB);
-#line 2072 "scanner.c"
+#line 2073 "scanner.c"
 }
 
 
 static void value_scan_job_init (GValue* value) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 2079 "scanner.c"
+#line 2080 "scanner.c"
 }
 
 
@@ -2084,7 +2085,7 @@ static void value_scan_job_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (value->data[0].v_pointer);
-#line 2088 "scanner.c"
+#line 2089 "scanner.c"
 	}
 }
 
@@ -2094,11 +2095,11 @@ static void value_scan_job_copy_value (const GValue* src_value, GValue* dest_val
 	if (src_value->data[0].v_pointer) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scan_job_ref (src_value->data[0].v_pointer);
-#line 2098 "scanner.c"
+#line 2099 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2102 "scanner.c"
+#line 2103 "scanner.c"
 	}
 }
 
@@ -2106,37 +2107,37 @@ static void value_scan_job_copy_value (const GValue* src_value, GValue* dest_val
 static gpointer value_scan_job_peek_pointer (const GValue* value) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2110 "scanner.c"
+#line 2111 "scanner.c"
 }
 
 
 static gchar* value_scan_job_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 2117 "scanner.c"
+#line 2118 "scanner.c"
 		ScanJob* object;
 		object = collect_values[0].v_pointer;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2124 "scanner.c"
+#line 2125 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2128 "scanner.c"
+#line 2129 "scanner.c"
 		}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scan_job_ref (object);
-#line 2132 "scanner.c"
+#line 2133 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2136 "scanner.c"
+#line 2137 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2140 "scanner.c"
+#line 2141 "scanner.c"
 }
 
 
@@ -2147,25 +2148,25 @@ static gchar* value_scan_job_lcopy_value (const GValue* value, guint n_collect_v
 	if (!object_p) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2151 "scanner.c"
+#line 2152 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 2157 "scanner.c"
+#line 2158 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2161 "scanner.c"
+#line 2162 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scan_job_ref (value->data[0].v_pointer);
-#line 2165 "scanner.c"
+#line 2166 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2169 "scanner.c"
+#line 2170 "scanner.c"
 }
 
 
@@ -2179,7 +2180,7 @@ GParamSpec* param_spec_scan_job (const gchar* name, const gchar* nick, const gch
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 2183 "scanner.c"
+#line 2184 "scanner.c"
 }
 
 
@@ -2188,7 +2189,7 @@ gpointer value_get_scan_job (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCAN_JOB), NULL);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2192 "scanner.c"
+#line 2193 "scanner.c"
 }
 
 
@@ -2208,17 +2209,17 @@ void value_set_scan_job (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_ref (value->data[0].v_pointer);
-#line 2212 "scanner.c"
+#line 2213 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2216 "scanner.c"
+#line 2217 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (old);
-#line 2222 "scanner.c"
+#line 2223 "scanner.c"
 	}
 }
 
@@ -2237,17 +2238,17 @@ void value_take_scan_job (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 2241 "scanner.c"
+#line 2242 "scanner.c"
 	} else {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2245 "scanner.c"
+#line 2246 "scanner.c"
 	}
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scan_job_unref (old);
-#line 2251 "scanner.c"
+#line 2252 "scanner.c"
 	}
 }
 
@@ -2257,14 +2258,14 @@ static void scan_job_class_init (ScanJobClass * klass) {
 	scan_job_parent_class = g_type_class_peek_parent (klass);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((ScanJobClass *) klass)->finalize = scan_job_finalize;
-#line 2261 "scanner.c"
+#line 2262 "scanner.c"
 }
 
 
 static void scan_job_instance_init (ScanJob * self) {
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 2268 "scanner.c"
+#line 2269 "scanner.c"
 }
 
 
@@ -2276,7 +2277,7 @@ static void scan_job_finalize (ScanJob* obj) {
 	g_signal_handlers_destroy (self);
 #line 90 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->device);
-#line 2280 "scanner.c"
+#line 2281 "scanner.c"
 }
 
 
@@ -2301,7 +2302,7 @@ gpointer scan_job_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 2305 "scanner.c"
+#line 2306 "scanner.c"
 }
 
 
@@ -2314,7 +2315,7 @@ void scan_job_unref (gpointer instance) {
 		SCAN_JOB_GET_CLASS (self)->finalize (self);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2318 "scanner.c"
+#line 2319 "scanner.c"
 	}
 }
 
@@ -2325,21 +2326,21 @@ Request* request_construct (GType object_type) {
 	self = (Request*) g_type_create_instance (object_type);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2329 "scanner.c"
+#line 2330 "scanner.c"
 }
 
 
 Request* request_new (void) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_construct (TYPE_REQUEST);
-#line 2336 "scanner.c"
+#line 2337 "scanner.c"
 }
 
 
 static void value_request_init (GValue* value) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 2343 "scanner.c"
+#line 2344 "scanner.c"
 }
 
 
@@ -2348,7 +2349,7 @@ static void value_request_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (value->data[0].v_pointer);
-#line 2352 "scanner.c"
+#line 2353 "scanner.c"
 	}
 }
 
@@ -2358,11 +2359,11 @@ static void value_request_copy_value (const GValue* src_value, GValue* dest_valu
 	if (src_value->data[0].v_pointer) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = request_ref (src_value->data[0].v_pointer);
-#line 2362 "scanner.c"
+#line 2363 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2366 "scanner.c"
+#line 2367 "scanner.c"
 	}
 }
 
@@ -2370,37 +2371,37 @@ static void value_request_copy_value (const GValue* src_value, GValue* dest_valu
 static gpointer value_request_peek_pointer (const GValue* value) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2374 "scanner.c"
+#line 2375 "scanner.c"
 }
 
 
 static gchar* value_request_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 2381 "scanner.c"
+#line 2382 "scanner.c"
 		Request* object;
 		object = collect_values[0].v_pointer;
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2388 "scanner.c"
+#line 2389 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2392 "scanner.c"
+#line 2393 "scanner.c"
 		}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = request_ref (object);
-#line 2396 "scanner.c"
+#line 2397 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2400 "scanner.c"
+#line 2401 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2404 "scanner.c"
+#line 2405 "scanner.c"
 }
 
 
@@ -2411,25 +2412,25 @@ static gchar* value_request_lcopy_value (const GValue* value, guint n_collect_va
 	if (!object_p) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2415 "scanner.c"
+#line 2416 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 2421 "scanner.c"
+#line 2422 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2425 "scanner.c"
+#line 2426 "scanner.c"
 	} else {
 #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 2430 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2433 "scanner.c"
+#line 2434 "scanner.c"
 }
 
 
@@ -2443,7 +2444,7 @@ GParamSpec* param_spec_request (const gchar* name, const gchar* nick, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 2447 "scanner.c"
+#line 2448 "scanner.c"
 }
 
 
@@ -2452,7 +2453,7 @@ gpointer value_get_request (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_REQUEST), NULL);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2456 "scanner.c"
+#line 2457 "scanner.c"
 }
 
 
@@ -2472,17 +2473,17 @@ void value_set_request (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_ref (value->data[0].v_pointer);
-#line 2476 "scanner.c"
+#line 2477 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2480 "scanner.c"
+#line 2481 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (old);
-#line 2486 "scanner.c"
+#line 2487 "scanner.c"
 	}
 }
 
@@ -2501,17 +2502,17 @@ void value_take_request (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 2505 "scanner.c"
+#line 2506 "scanner.c"
 	} else {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2509 "scanner.c"
+#line 2510 "scanner.c"
 	}
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		request_unref (old);
-#line 2515 "scanner.c"
+#line 2516 "scanner.c"
 	}
 }
 
@@ -2521,14 +2522,14 @@ static void request_class_init (RequestClass * klass) {
 	request_parent_class = g_type_class_peek_parent (klass);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((RequestClass *) klass)->finalize = request_finalize;
-#line 2525 "scanner.c"
+#line 2526 "scanner.c"
 }
 
 
 static void request_instance_init (Request * self) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 2532 "scanner.c"
+#line 2533 "scanner.c"
 }
 
 
@@ -2538,7 +2539,7 @@ static void request_finalize (Request* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_REQUEST, Request);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
-#line 2542 "scanner.c"
+#line 2543 "scanner.c"
 }
 
 
@@ -2563,7 +2564,7 @@ gpointer request_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 2567 "scanner.c"
+#line 2568 "scanner.c"
 }
 
 
@@ -2576,7 +2577,7 @@ void request_unref (gpointer instance) {
 		REQUEST_GET_CLASS (self)->finalize (self);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2580 "scanner.c"
+#line 2581 "scanner.c"
 	}
 }
 
@@ -2587,21 +2588,21 @@ RequestRedetect* request_redetect_construct (GType object_type) {
 	self = (RequestRedetect*) request_construct (object_type);
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2591 "scanner.c"
+#line 2592 "scanner.c"
 }
 
 
 RequestRedetect* request_redetect_new (void) {
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_redetect_construct (TYPE_REQUEST_REDETECT);
-#line 2598 "scanner.c"
+#line 2599 "scanner.c"
 }
 
 
 static void request_redetect_class_init (RequestRedetectClass * klass) {
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_redetect_parent_class = g_type_class_peek_parent (klass);
-#line 2605 "scanner.c"
+#line 2606 "scanner.c"
 }
 
 
@@ -2627,21 +2628,21 @@ RequestCancel* request_cancel_construct (GType object_type) {
 	self = (RequestCancel*) request_construct (object_type);
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2631 "scanner.c"
+#line 2632 "scanner.c"
 }
 
 
 RequestCancel* request_cancel_new (void) {
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_cancel_construct (TYPE_REQUEST_CANCEL);
-#line 2638 "scanner.c"
+#line 2639 "scanner.c"
 }
 
 
 static void request_cancel_class_init (RequestCancelClass * klass) {
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_cancel_parent_class = g_type_class_peek_parent (klass);
-#line 2645 "scanner.c"
+#line 2646 "scanner.c"
 }
 
 
@@ -2667,14 +2668,14 @@ RequestStartScan* request_start_scan_construct (GType object_type) {
 	self = (RequestStartScan*) request_construct (object_type);
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2671 "scanner.c"
+#line 2672 "scanner.c"
 }
 
 
 RequestStartScan* request_start_scan_new (void) {
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_start_scan_construct (TYPE_REQUEST_START_SCAN);
-#line 2678 "scanner.c"
+#line 2679 "scanner.c"
 }
 
 
@@ -2683,7 +2684,7 @@ static void request_start_scan_class_init (RequestStartScanClass * klass) {
 	request_start_scan_parent_class = g_type_class_peek_parent (klass);
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((RequestClass *) klass)->finalize = request_start_scan_finalize;
-#line 2687 "scanner.c"
+#line 2688 "scanner.c"
 }
 
 
@@ -2699,7 +2700,7 @@ static void request_start_scan_finalize (Request* obj) {
 	_scan_job_unref0 (self->job);
 #line 107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	REQUEST_CLASS (request_start_scan_parent_class)->finalize (obj);
-#line 2703 "scanner.c"
+#line 2704 "scanner.c"
 }
 
 
@@ -2721,21 +2722,21 @@ RequestQuit* request_quit_construct (GType object_type) {
 	self = (RequestQuit*) request_construct (object_type);
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2725 "scanner.c"
+#line 2726 "scanner.c"
 }
 
 
 RequestQuit* request_quit_new (void) {
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return request_quit_construct (TYPE_REQUEST_QUIT);
-#line 2732 "scanner.c"
+#line 2733 "scanner.c"
 }
 
 
 static void request_quit_class_init (RequestQuitClass * klass) {
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_quit_parent_class = g_type_class_peek_parent (klass);
-#line 2739 "scanner.c"
+#line 2740 "scanner.c"
 }
 
 
@@ -2761,21 +2762,21 @@ Credentials* credentials_construct (GType object_type) {
 	self = (Credentials*) g_type_create_instance (object_type);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 2765 "scanner.c"
+#line 2766 "scanner.c"
 }
 
 
 Credentials* credentials_new (void) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return credentials_construct (TYPE_CREDENTIALS);
-#line 2772 "scanner.c"
+#line 2773 "scanner.c"
 }
 
 
 static void value_credentials_init (GValue* value) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 2779 "scanner.c"
+#line 2780 "scanner.c"
 }
 
 
@@ -2784,7 +2785,7 @@ static void value_credentials_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (value->data[0].v_pointer);
-#line 2788 "scanner.c"
+#line 2789 "scanner.c"
 	}
 }
 
@@ -2794,11 +2795,11 @@ static void value_credentials_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = credentials_ref (src_value->data[0].v_pointer);
-#line 2798 "scanner.c"
+#line 2799 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2802 "scanner.c"
+#line 2803 "scanner.c"
 	}
 }
 
@@ -2806,37 +2807,37 @@ static void value_credentials_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_credentials_peek_pointer (const GValue* value) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2810 "scanner.c"
+#line 2811 "scanner.c"
 }
 
 
 static gchar* value_credentials_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 2817 "scanner.c"
+#line 2818 "scanner.c"
 		Credentials* object;
 		object = collect_values[0].v_pointer;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2824 "scanner.c"
+#line 2825 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2828 "scanner.c"
+#line 2829 "scanner.c"
 		}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = credentials_ref (object);
-#line 2832 "scanner.c"
+#line 2833 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2836 "scanner.c"
+#line 2837 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2840 "scanner.c"
+#line 2841 "scanner.c"
 }
 
 
@@ -2847,25 +2848,25 @@ static gchar* value_credentials_lcopy_value (const GValue* value, guint n_collec
 	if (!object_p) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2851 "scanner.c"
+#line 2852 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 2857 "scanner.c"
+#line 2858 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2861 "scanner.c"
+#line 2862 "scanner.c"
 	} else {
 #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 2866 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 2869 "scanner.c"
+#line 2870 "scanner.c"
 }
 
 
@@ -2879,7 +2880,7 @@ GParamSpec* param_spec_credentials (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 2883 "scanner.c"
+#line 2884 "scanner.c"
 }
 
 
@@ -2888,7 +2889,7 @@ gpointer value_get_credentials (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_CREDENTIALS), NULL);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 2892 "scanner.c"
+#line 2893 "scanner.c"
 }
 
 
@@ -2908,17 +2909,17 @@ void value_set_credentials (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_ref (value->data[0].v_pointer);
-#line 2912 "scanner.c"
+#line 2913 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2916 "scanner.c"
+#line 2917 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (old);
-#line 2922 "scanner.c"
+#line 2923 "scanner.c"
 	}
 }
 
@@ -2937,17 +2938,17 @@ void value_take_credentials (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 2941 "scanner.c"
+#line 2942 "scanner.c"
 	} else {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 2945 "scanner.c"
+#line 2946 "scanner.c"
 	}
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		credentials_unref (old);
-#line 2951 "scanner.c"
+#line 2952 "scanner.c"
 	}
 }
 
@@ -2957,14 +2958,14 @@ static void credentials_class_init (CredentialsClass * klass) {
 	credentials_parent_class = g_type_class_peek_parent (klass);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((CredentialsClass *) klass)->finalize = credentials_finalize;
-#line 2961 "scanner.c"
+#line 2962 "scanner.c"
 }
 
 
 static void credentials_instance_init (Credentials * self) {
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 2968 "scanner.c"
+#line 2969 "scanner.c"
 }
 
 
@@ -2978,7 +2979,7 @@ static void credentials_finalize (Credentials* obj) {
 	_g_free0 (self->username);
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->password);
-#line 2982 "scanner.c"
+#line 2983 "scanner.c"
 }
 
 
@@ -3003,7 +3004,7 @@ gpointer credentials_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 3007 "scanner.c"
+#line 3008 "scanner.c"
 }
 
 
@@ -3016,7 +3017,7 @@ void credentials_unref (gpointer instance) {
 		CREDENTIALS_GET_CLASS (self)->finalize (self);
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3020 "scanner.c"
+#line 3021 "scanner.c"
 	}
 }
 
@@ -3036,7 +3037,7 @@ GType scan_state_get_type (void) {
 static void notify_real_run (Notify* self, Scanner* scanner) {
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (scanner != NULL);
-#line 3040 "scanner.c"
+#line 3041 "scanner.c"
 }
 
 
@@ -3045,7 +3046,7 @@ void notify_run (Notify* self, Scanner* scanner) {
 	g_return_if_fail (self != NULL);
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_GET_CLASS (self)->run (self, scanner);
-#line 3049 "scanner.c"
+#line 3050 "scanner.c"
 }
 
 
@@ -3055,21 +3056,21 @@ Notify* notify_construct (GType object_type) {
 	self = (Notify*) g_type_create_instance (object_type);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3059 "scanner.c"
+#line 3060 "scanner.c"
 }
 
 
 Notify* notify_new (void) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_construct (TYPE_NOTIFY);
-#line 3066 "scanner.c"
+#line 3067 "scanner.c"
 }
 
 
 static void value_notify_init (GValue* value) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 3073 "scanner.c"
+#line 3074 "scanner.c"
 }
 
 
@@ -3078,7 +3079,7 @@ static void value_notify_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (value->data[0].v_pointer);
-#line 3082 "scanner.c"
+#line 3083 "scanner.c"
 	}
 }
 
@@ -3088,11 +3089,11 @@ static void value_notify_copy_value (const GValue* src_value, GValue* dest_value
 	if (src_value->data[0].v_pointer) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = notify_ref (src_value->data[0].v_pointer);
-#line 3092 "scanner.c"
+#line 3093 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3096 "scanner.c"
+#line 3097 "scanner.c"
 	}
 }
 
@@ -3100,37 +3101,37 @@ static void value_notify_copy_value (const GValue* src_value, GValue* dest_value
 static gpointer value_notify_peek_pointer (const GValue* value) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 3104 "scanner.c"
+#line 3105 "scanner.c"
 }
 
 
 static gchar* value_notify_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 3111 "scanner.c"
+#line 3112 "scanner.c"
 		Notify* object;
 		object = collect_values[0].v_pointer;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3118 "scanner.c"
+#line 3119 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3122 "scanner.c"
+#line 3123 "scanner.c"
 		}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = notify_ref (object);
-#line 3126 "scanner.c"
+#line 3127 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 3130 "scanner.c"
+#line 3131 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 3134 "scanner.c"
+#line 3135 "scanner.c"
 }
 
 
@@ -3141,25 +3142,25 @@ static gchar* value_notify_lcopy_value (const GValue* value, guint n_collect_val
 	if (!object_p) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3145 "scanner.c"
+#line 3146 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 3151 "scanner.c"
+#line 3152 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3155 "scanner.c"
+#line 3156 "scanner.c"
 	} else {
 #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 3160 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 3163 "scanner.c"
+#line 3164 "scanner.c"
 }
 
 
@@ -3173,7 +3174,7 @@ GParamSpec* param_spec_notify (const gchar* name, const gchar* nick, const gchar
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 3177 "scanner.c"
+#line 3178 "scanner.c"
 }
 
 
@@ -3182,7 +3183,7 @@ gpointer value_get_notify (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_NOTIFY), NULL);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 3186 "scanner.c"
+#line 3187 "scanner.c"
 }
 
 
@@ -3202,17 +3203,17 @@ void value_set_notify (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_ref (value->data[0].v_pointer);
-#line 3206 "scanner.c"
+#line 3207 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 3210 "scanner.c"
+#line 3211 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (old);
-#line 3216 "scanner.c"
+#line 3217 "scanner.c"
 	}
 }
 
@@ -3231,17 +3232,17 @@ void value_take_notify (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 3235 "scanner.c"
+#line 3236 "scanner.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 3239 "scanner.c"
+#line 3240 "scanner.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		notify_unref (old);
-#line 3245 "scanner.c"
+#line 3246 "scanner.c"
 	}
 }
 
@@ -3253,14 +3254,14 @@ static void notify_class_init (NotifyClass * klass) {
 	((NotifyClass *) klass)->finalize = notify_finalize;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_real_run;
-#line 3257 "scanner.c"
+#line 3258 "scanner.c"
 }
 
 
 static void notify_instance_init (Notify * self) {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 3264 "scanner.c"
+#line 3265 "scanner.c"
 }
 
 
@@ -3270,7 +3271,7 @@ static void notify_finalize (Notify* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY, Notify);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_handlers_destroy (self);
-#line 3274 "scanner.c"
+#line 3275 "scanner.c"
 }
 
 
@@ -3295,7 +3296,7 @@ gpointer notify_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 3299 "scanner.c"
+#line 3300 "scanner.c"
 }
 
 
@@ -3308,7 +3309,7 @@ void notify_unref (gpointer instance) {
 		NOTIFY_GET_CLASS (self)->finalize (self);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3312 "scanner.c"
+#line 3313 "scanner.c"
 	}
 }
 
@@ -3324,7 +3325,7 @@ static void notify_scanning_changed_real_run (Notify* base, Scanner* scanner) {
 	_tmp0_ = scanner;
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "scanning-changed");
-#line 3328 "scanner.c"
+#line 3329 "scanner.c"
 }
 
 
@@ -3334,14 +3335,14 @@ NotifyScanningChanged* notify_scanning_changed_construct (GType object_type) {
 	self = (NotifyScanningChanged*) notify_construct (object_type);
 #line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3338 "scanner.c"
+#line 3339 "scanner.c"
 }
 
 
 NotifyScanningChanged* notify_scanning_changed_new (void) {
 #line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_scanning_changed_construct (TYPE_NOTIFY_SCANNING_CHANGED);
-#line 3345 "scanner.c"
+#line 3346 "scanner.c"
 }
 
 
@@ -3350,7 +3351,7 @@ static void notify_scanning_changed_class_init (NotifyScanningChangedClass * kla
 	notify_scanning_changed_parent_class = g_type_class_peek_parent (klass);
 #line 136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_scanning_changed_real_run;
-#line 3354 "scanner.c"
+#line 3355 "scanner.c"
 }
 
 
@@ -3373,7 +3374,7 @@ GType notify_scanning_changed_get_type (void) {
 static void _scan_device_unref0_ (gpointer var) {
 #line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (scan_device_unref (var), NULL));
-#line 3377 "scanner.c"
+#line 3378 "scanner.c"
 }
 
 
@@ -3382,7 +3383,7 @@ static void _g_list_free__scan_device_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _scan_device_unref0_, NULL);
 #line 144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_free (self);
-#line 3386 "scanner.c"
+#line 3387 "scanner.c"
 }
 
 
@@ -3403,14 +3404,14 @@ NotifyUpdateDevices* notify_update_devices_construct (GType object_type, GList*
 	__g_list_free__scan_device_unref0_0 (devices);
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3407 "scanner.c"
+#line 3408 "scanner.c"
 }
 
 
 NotifyUpdateDevices* notify_update_devices_new (GList* devices) {
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_update_devices_construct (TYPE_NOTIFY_UPDATE_DEVICES, devices);
-#line 3414 "scanner.c"
+#line 3415 "scanner.c"
 }
 
 
@@ -3428,7 +3429,7 @@ static void notify_update_devices_real_run (Notify* base, Scanner* scanner) {
 	_tmp1_ = self->priv->devices;
 #line 145 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "update-devices", _tmp1_);
-#line 3432 "scanner.c"
+#line 3433 "scanner.c"
 }
 
 
@@ -3441,14 +3442,14 @@ static void notify_update_devices_class_init (NotifyUpdateDevicesClass * klass)
 	g_type_class_add_private (klass, sizeof (NotifyUpdateDevicesPrivate));
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_update_devices_real_run;
-#line 3445 "scanner.c"
+#line 3446 "scanner.c"
 }
 
 
 static void notify_update_devices_instance_init (NotifyUpdateDevices * self) {
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_UPDATE_DEVICES_GET_PRIVATE (self);
-#line 3452 "scanner.c"
+#line 3453 "scanner.c"
 }
 
 
@@ -3460,7 +3461,7 @@ static void notify_update_devices_finalize (Notify* obj) {
 	__g_list_free__scan_device_unref0_0 (self->priv->devices);
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_update_devices_parent_class)->finalize (obj);
-#line 3464 "scanner.c"
+#line 3465 "scanner.c"
 }
 
 
@@ -3494,14 +3495,14 @@ NotifyRequestAuthorization* notify_request_authorization_construct (GType object
 	self->priv->resource = _tmp1_;
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3498 "scanner.c"
+#line 3499 "scanner.c"
 }
 
 
 NotifyRequestAuthorization* notify_request_authorization_new (const gchar* resource) {
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_request_authorization_construct (TYPE_NOTIFY_REQUEST_AUTHORIZATION, resource);
-#line 3505 "scanner.c"
+#line 3506 "scanner.c"
 }
 
 
@@ -3519,7 +3520,7 @@ static void notify_request_authorization_real_run (Notify* base, Scanner* scanne
 	_tmp1_ = self->priv->resource;
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "request-authorization", _tmp1_);
-#line 3523 "scanner.c"
+#line 3524 "scanner.c"
 }
 
 
@@ -3532,14 +3533,14 @@ static void notify_request_authorization_class_init (NotifyRequestAuthorizationC
 	g_type_class_add_private (klass, sizeof (NotifyRequestAuthorizationPrivate));
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_request_authorization_real_run;
-#line 3536 "scanner.c"
+#line 3537 "scanner.c"
 }
 
 
 static void notify_request_authorization_instance_init (NotifyRequestAuthorization * self) {
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_REQUEST_AUTHORIZATION_GET_PRIVATE (self);
-#line 3543 "scanner.c"
+#line 3544 "scanner.c"
 }
 
 
@@ -3551,7 +3552,7 @@ static void notify_request_authorization_finalize (Notify* obj) {
 	_g_free0 (self->priv->resource);
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_request_authorization_parent_class)->finalize (obj);
-#line 3555 "scanner.c"
+#line 3556 "scanner.c"
 }
 
 
@@ -3590,14 +3591,14 @@ NotifyScanFailed* notify_scan_failed_construct (GType object_type, gint error_co
 	self->priv->error_string = _tmp2_;
 #line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3594 "scanner.c"
+#line 3595 "scanner.c"
 }
 
 
 NotifyScanFailed* notify_scan_failed_new (gint error_code, const gchar* error_string) {
 #line 157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_scan_failed_construct (TYPE_NOTIFY_SCAN_FAILED, error_code, error_string);
-#line 3601 "scanner.c"
+#line 3602 "scanner.c"
 }
 
 
@@ -3618,7 +3619,7 @@ static void notify_scan_failed_real_run (Notify* base, Scanner* scanner) {
 	_tmp2_ = self->priv->error_string;
 #line 160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "scan-failed", _tmp1_, _tmp2_);
-#line 3622 "scanner.c"
+#line 3623 "scanner.c"
 }
 
 
@@ -3631,14 +3632,14 @@ static void notify_scan_failed_class_init (NotifyScanFailedClass * klass) {
 	g_type_class_add_private (klass, sizeof (NotifyScanFailedPrivate));
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_scan_failed_real_run;
-#line 3635 "scanner.c"
+#line 3636 "scanner.c"
 }
 
 
 static void notify_scan_failed_instance_init (NotifyScanFailed * self) {
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_SCAN_FAILED_GET_PRIVATE (self);
-#line 3642 "scanner.c"
+#line 3643 "scanner.c"
 }
 
 
@@ -3650,7 +3651,7 @@ static void notify_scan_failed_finalize (Notify* obj) {
 	_g_free0 (self->priv->error_string);
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_scan_failed_parent_class)->finalize (obj);
-#line 3654 "scanner.c"
+#line 3655 "scanner.c"
 }
 
 
@@ -3677,7 +3678,7 @@ static void notify_document_done_real_run (Notify* base, Scanner* scanner) {
 	_tmp0_ = scanner;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "document-done");
-#line 3681 "scanner.c"
+#line 3682 "scanner.c"
 }
 
 
@@ -3687,14 +3688,14 @@ NotifyDocumentDone* notify_document_done_construct (GType object_type) {
 	self = (NotifyDocumentDone*) notify_construct (object_type);
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3691 "scanner.c"
+#line 3692 "scanner.c"
 }
 
 
 NotifyDocumentDone* notify_document_done_new (void) {
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_document_done_construct (TYPE_NOTIFY_DOCUMENT_DONE);
-#line 3698 "scanner.c"
+#line 3699 "scanner.c"
 }
 
 
@@ -3703,7 +3704,7 @@ static void notify_document_done_class_init (NotifyDocumentDoneClass * klass) {
 	notify_document_done_parent_class = g_type_class_peek_parent (klass);
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_document_done_real_run;
-#line 3707 "scanner.c"
+#line 3708 "scanner.c"
 }
 
 
@@ -3734,7 +3735,7 @@ static void notify_expect_page_real_run (Notify* base, Scanner* scanner) {
 	_tmp0_ = scanner;
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_emit_by_name (_tmp0_, "expect-page");
-#line 3738 "scanner.c"
+#line 3739 "scanner.c"
 }
 
 
@@ -3744,14 +3745,14 @@ NotifyExpectPage* notify_expect_page_construct (GType object_type) {
 	self = (NotifyExpectPage*) notify_construct (object_type);
 #line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3748 "scanner.c"
+#line 3749 "scanner.c"
 }
 
 
 NotifyExpectPage* notify_expect_page_new (void) {
 #line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_expect_page_construct (TYPE_NOTIFY_EXPECT_PAGE);
-#line 3755 "scanner.c"
+#line 3756 "scanner.c"
 }
 
 
@@ -3760,7 +3761,7 @@ static void notify_expect_page_class_init (NotifyExpectPageClass * klass) {
 	notify_expect_page_parent_class = g_type_class_peek_parent (klass);
 #line 168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_expect_page_real_run;
-#line 3764 "scanner.c"
+#line 3765 "scanner.c"
 }
 
 
@@ -3783,7 +3784,7 @@ GType notify_expect_page_get_type (void) {
 static gpointer _scan_page_info_ref0 (gpointer self) {
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_page_info_ref (self) : NULL;
-#line 3787 "scanner.c"
+#line 3788 "scanner.c"
 }
 
 
@@ -3810,14 +3811,14 @@ NotifyGotPageInfo* notify_got_page_info_construct (GType object_type, gint job_i
 	self->priv->info = _tmp2_;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3814 "scanner.c"
+#line 3815 "scanner.c"
 }
 
 
 NotifyGotPageInfo* notify_got_page_info_new (gint job_id, ScanPageInfo* info) {
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_got_page_info_construct (TYPE_NOTIFY_GOT_PAGE_INFO, job_id, info);
-#line 3821 "scanner.c"
+#line 3822 "scanner.c"
 }
 
 
@@ -3839,7 +3840,7 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 	_tmp3_ = _tmp2_->first_job_id;
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
-#line 3843 "scanner.c"
+#line 3844 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -3851,15 +3852,15 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 		_tmp6_ = _tmp5_->job_id;
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
-#line 3855 "scanner.c"
+#line 3856 "scanner.c"
 	} else {
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 3859 "scanner.c"
+#line 3860 "scanner.c"
 	}
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 3863 "scanner.c"
+#line 3864 "scanner.c"
 		Scanner* _tmp7_ = NULL;
 		ScanPageInfo* _tmp8_ = NULL;
 #line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3868,7 +3869,7 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 		_tmp8_ = self->priv->info;
 #line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp7_, "got-page-info", _tmp8_);
-#line 3872 "scanner.c"
+#line 3873 "scanner.c"
 	}
 }
 
@@ -3882,14 +3883,14 @@ static void notify_got_page_info_class_init (NotifyGotPageInfoClass * klass) {
 	g_type_class_add_private (klass, sizeof (NotifyGotPageInfoPrivate));
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_got_page_info_real_run;
-#line 3886 "scanner.c"
+#line 3887 "scanner.c"
 }
 
 
 static void notify_got_page_info_instance_init (NotifyGotPageInfo * self) {
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_GOT_PAGE_INFO_GET_PRIVATE (self);
-#line 3893 "scanner.c"
+#line 3894 "scanner.c"
 }
 
 
@@ -3901,7 +3902,7 @@ static void notify_got_page_info_finalize (Notify* obj) {
 	_scan_page_info_unref0 (self->priv->info);
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_got_page_info_parent_class)->finalize (obj);
-#line 3905 "scanner.c"
+#line 3906 "scanner.c"
 }
 
 
@@ -3928,14 +3929,14 @@ NotifyPageDone* notify_page_done_construct (GType object_type, gint job_id) {
 	self->priv->job_id = _tmp0_;
 #line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3932 "scanner.c"
+#line 3933 "scanner.c"
 }
 
 
 NotifyPageDone* notify_page_done_new (gint job_id) {
 #line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_page_done_construct (TYPE_NOTIFY_PAGE_DONE, job_id);
-#line 3939 "scanner.c"
+#line 3940 "scanner.c"
 }
 
 
@@ -3957,7 +3958,7 @@ static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 	_tmp3_ = _tmp2_->first_job_id;
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
-#line 3961 "scanner.c"
+#line 3962 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -3969,21 +3970,21 @@ static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 		_tmp6_ = _tmp5_->job_id;
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
-#line 3973 "scanner.c"
+#line 3974 "scanner.c"
 	} else {
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 3977 "scanner.c"
+#line 3978 "scanner.c"
 	}
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 3981 "scanner.c"
+#line 3982 "scanner.c"
 		Scanner* _tmp7_ = NULL;
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = scanner;
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp7_, "page-done");
-#line 3987 "scanner.c"
+#line 3988 "scanner.c"
 	}
 }
 
@@ -3997,14 +3998,14 @@ static void notify_page_done_class_init (NotifyPageDoneClass * klass) {
 	g_type_class_add_private (klass, sizeof (NotifyPageDonePrivate));
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_page_done_real_run;
-#line 4001 "scanner.c"
+#line 4002 "scanner.c"
 }
 
 
 static void notify_page_done_instance_init (NotifyPageDone * self) {
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_PAGE_DONE_GET_PRIVATE (self);
-#line 4008 "scanner.c"
+#line 4009 "scanner.c"
 }
 
 
@@ -4014,7 +4015,7 @@ static void notify_page_done_finalize (Notify* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_PAGE_DONE, NotifyPageDone);
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_page_done_parent_class)->finalize (obj);
-#line 4018 "scanner.c"
+#line 4019 "scanner.c"
 }
 
 
@@ -4033,7 +4034,7 @@ GType notify_page_done_get_type (void) {
 static gpointer _scan_line_ref0 (gpointer self) {
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_line_ref (self) : NULL;
-#line 4037 "scanner.c"
+#line 4038 "scanner.c"
 }
 
 
@@ -4060,14 +4061,14 @@ NotifyGotLine* notify_got_line_construct (GType object_type, gint job_id, ScanLi
 	self->priv->line = _tmp2_;
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 4064 "scanner.c"
+#line 4065 "scanner.c"
 }
 
 
 NotifyGotLine* notify_got_line_new (gint job_id, ScanLine* line) {
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_got_line_construct (TYPE_NOTIFY_GOT_LINE, job_id, line);
-#line 4071 "scanner.c"
+#line 4072 "scanner.c"
 }
 
 
@@ -4089,7 +4090,7 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 	_tmp3_ = _tmp2_->first_job_id;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
-#line 4093 "scanner.c"
+#line 4094 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -4101,15 +4102,15 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 		_tmp6_ = _tmp5_->job_id;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
-#line 4105 "scanner.c"
+#line 4106 "scanner.c"
 	} else {
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 4109 "scanner.c"
+#line 4110 "scanner.c"
 	}
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 4113 "scanner.c"
+#line 4114 "scanner.c"
 		Scanner* _tmp7_ = NULL;
 		ScanLine* _tmp8_ = NULL;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4118,7 +4119,7 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 		_tmp8_ = self->priv->line;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_signal_emit_by_name (_tmp7_, "got-line", _tmp8_);
-#line 4122 "scanner.c"
+#line 4123 "scanner.c"
 	}
 }
 
@@ -4132,14 +4133,14 @@ static void notify_got_line_class_init (NotifyGotLineClass * klass) {
 	g_type_class_add_private (klass, sizeof (NotifyGotLinePrivate));
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	((NotifyClass *) klass)->run = notify_got_line_real_run;
-#line 4136 "scanner.c"
+#line 4137 "scanner.c"
 }
 
 
 static void notify_got_line_instance_init (NotifyGotLine * self) {
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_GOT_LINE_GET_PRIVATE (self);
-#line 4143 "scanner.c"
+#line 4144 "scanner.c"
 }
 
 
@@ -4151,7 +4152,7 @@ static void notify_got_line_finalize (Notify* obj) {
 	_scan_line_unref0 (self->priv->line);
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_got_line_parent_class)->finalize (obj);
-#line 4155 "scanner.c"
+#line 4156 "scanner.c"
 }
 
 
@@ -4170,7 +4171,7 @@ GType notify_got_line_get_type (void) {
 static void _scan_job_unref0_ (gpointer var) {
 #line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (scan_job_unref (var), NULL));
-#line 4174 "scanner.c"
+#line 4175 "scanner.c"
 }
 
 
@@ -4179,28 +4180,28 @@ static void _g_list_free__scan_job_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _scan_job_unref0_, NULL);
 #line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_free (self);
-#line 4183 "scanner.c"
+#line 4184 "scanner.c"
 }
 
 
 static void _request_unref0_ (gpointer var) {
 #line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (request_unref (var), NULL));
-#line 4190 "scanner.c"
+#line 4191 "scanner.c"
 }
 
 
 static void _notify_unref0_ (gpointer var) {
 #line 274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (notify_unref (var), NULL));
-#line 4197 "scanner.c"
+#line 4198 "scanner.c"
 }
 
 
 static void _credentials_unref0_ (gpointer var) {
 #line 275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (credentials_unref (var), NULL));
-#line 4204 "scanner.c"
+#line 4205 "scanner.c"
 }
 
 
@@ -4231,21 +4232,21 @@ static Scanner* scanner_construct (GType object_type) {
 	self->priv->authorize_queue = _tmp2_;
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 4235 "scanner.c"
+#line 4236 "scanner.c"
 }
 
 
 static Scanner* scanner_new (void) {
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scanner_construct (TYPE_SCANNER);
-#line 4242 "scanner.c"
+#line 4243 "scanner.c"
 }
 
 
 static gpointer _scanner_ref0 (gpointer self) {
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scanner_ref (self) : NULL;
-#line 4249 "scanner.c"
+#line 4250 "scanner.c"
 }
 
 
@@ -4258,7 +4259,7 @@ Scanner* scanner_get_instance (void) {
 	_tmp0_ = scanner_scanner_object;
 #line 280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_ == NULL) {
-#line 4262 "scanner.c"
+#line 4263 "scanner.c"
 		Scanner* _tmp1_ = NULL;
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = scanner_new ();
@@ -4266,7 +4267,7 @@ Scanner* scanner_get_instance (void) {
 		_scanner_unref0 (scanner_scanner_object);
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_scanner_object = _tmp1_;
-#line 4270 "scanner.c"
+#line 4271 "scanner.c"
 	}
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner_scanner_object;
@@ -4276,7 +4277,7 @@ Scanner* scanner_get_instance (void) {
 	result = _tmp3_;
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4280 "scanner.c"
+#line 4281 "scanner.c"
 }
 
 
@@ -4301,14 +4302,14 @@ static gboolean scanner_notify_idle_cb (Scanner* self) {
 	_notify_unref0 (notification);
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4305 "scanner.c"
+#line 4306 "scanner.c"
 }
 
 
 static gpointer _notify_ref0 (gpointer self) {
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? notify_ref (self) : NULL;
-#line 4312 "scanner.c"
+#line 4313 "scanner.c"
 }
 
 
@@ -4317,7 +4318,7 @@ static gboolean _scanner_notify_idle_cb_gsource_func (gpointer self) {
 	result = scanner_notify_idle_cb ((Scanner*) self);
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4321 "scanner.c"
+#line 4322 "scanner.c"
 }
 
 
@@ -4339,7 +4340,7 @@ static void scanner_notify (Scanner* self, Notify* notification) {
 	g_async_queue_push (_tmp0_, _tmp2_);
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _scanner_notify_idle_cb_gsource_func, scanner_ref (self), scanner_unref);
-#line 4343 "scanner.c"
+#line 4344 "scanner.c"
 }
 
 
@@ -4353,23 +4354,23 @@ static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 	_tmp2_ = self->priv->scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_) {
-#line 4357 "scanner.c"
+#line 4358 "scanner.c"
 		gboolean _tmp3_ = FALSE;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = is_scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = !_tmp3_;
-#line 4363 "scanner.c"
+#line 4364 "scanner.c"
 	} else {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = FALSE;
-#line 4367 "scanner.c"
+#line 4368 "scanner.c"
 	}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_) {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = TRUE;
-#line 4373 "scanner.c"
+#line 4374 "scanner.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
@@ -4377,25 +4378,25 @@ static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 		_tmp5_ = self->priv->scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (!_tmp5_) {
-#line 4381 "scanner.c"
+#line 4382 "scanner.c"
 			gboolean _tmp6_ = FALSE;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = is_scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = _tmp6_;
-#line 4387 "scanner.c"
+#line 4388 "scanner.c"
 		} else {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = FALSE;
-#line 4391 "scanner.c"
+#line 4392 "scanner.c"
 		}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_;
-#line 4395 "scanner.c"
+#line 4396 "scanner.c"
 	}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 4399 "scanner.c"
+#line 4400 "scanner.c"
 		gboolean _tmp7_ = FALSE;
 		NotifyScanningChanged* _tmp8_ = NULL;
 		NotifyScanningChanged* _tmp9_ = NULL;
@@ -4411,7 +4412,7 @@ static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 		scanner_notify (self, (Notify*) _tmp9_);
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_notify_unref0 (_tmp9_);
-#line 4415 "scanner.c"
+#line 4416 "scanner.c"
 	}
 }
 
@@ -4420,19 +4421,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1278 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1278 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1278 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1278 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1279 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1279 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1279 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1279 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
-#line 4436 "scanner.c"
+#line 4437 "scanner.c"
 }
 
 
@@ -4454,7 +4455,7 @@ static gint scanner_get_device_weight (const gchar* device) {
 		result = 2;
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 4458 "scanner.c"
+#line 4459 "scanner.c"
 	}
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = device;
@@ -4466,13 +4467,13 @@ static gint scanner_get_device_weight (const gchar* device) {
 		result = 0;
 #line 317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 4470 "scanner.c"
+#line 4471 "scanner.c"
 	}
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = 1;
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4476 "scanner.c"
+#line 4477 "scanner.c"
 }
 
 
@@ -4520,7 +4521,7 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 	_tmp7_ = weight2;
 #line 328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != _tmp7_) {
-#line 4524 "scanner.c"
+#line 4525 "scanner.c"
 		gint _tmp8_ = 0;
 		gint _tmp9_ = 0;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4531,7 +4532,7 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 		result = _tmp8_ - _tmp9_;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 4535 "scanner.c"
+#line 4536 "scanner.c"
 	}
 #line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = g_strcmp0;
@@ -4549,7 +4550,7 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 	result = _tmp15_;
 #line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4553 "scanner.c"
+#line 4554 "scanner.c"
 }
 
 
@@ -4562,7 +4563,7 @@ static gchar* sane_status_to_string (SANE_Status status) {
 	switch (_tmp0_) {
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_GOOD:
-#line 4566 "scanner.c"
+#line 4567 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4571,11 +4572,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp1_;
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4575 "scanner.c"
+#line 4576 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_UNSUPPORTED:
-#line 4579 "scanner.c"
+#line 4580 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4584,11 +4585,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp2_;
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4588 "scanner.c"
+#line 4589 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_CANCELLED:
-#line 4592 "scanner.c"
+#line 4593 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4597,11 +4598,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp3_;
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4601 "scanner.c"
+#line 4602 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_DEVICE_BUSY:
-#line 4605 "scanner.c"
+#line 4606 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4610,11 +4611,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp4_;
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4614 "scanner.c"
+#line 4615 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_INVAL:
-#line 4618 "scanner.c"
+#line 4619 "scanner.c"
 		{
 			gchar* _tmp5_ = NULL;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4623,11 +4624,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp5_;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4627 "scanner.c"
+#line 4628 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_EOF:
-#line 4631 "scanner.c"
+#line 4632 "scanner.c"
 		{
 			gchar* _tmp6_ = NULL;
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4636,11 +4637,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp6_;
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4640 "scanner.c"
+#line 4641 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_JAMMED:
-#line 4644 "scanner.c"
+#line 4645 "scanner.c"
 		{
 			gchar* _tmp7_ = NULL;
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4649,11 +4650,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp7_;
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4653 "scanner.c"
+#line 4654 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_DOCS:
-#line 4657 "scanner.c"
+#line 4658 "scanner.c"
 		{
 			gchar* _tmp8_ = NULL;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4662,11 +4663,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp8_;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4666 "scanner.c"
+#line 4667 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_COVER_OPEN:
-#line 4670 "scanner.c"
+#line 4671 "scanner.c"
 		{
 			gchar* _tmp9_ = NULL;
 #line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4675,11 +4676,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp9_;
 #line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4679 "scanner.c"
+#line 4680 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_IO_ERROR:
-#line 4683 "scanner.c"
+#line 4684 "scanner.c"
 		{
 			gchar* _tmp10_ = NULL;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4688,11 +4689,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp10_;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4692 "scanner.c"
+#line 4693 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_MEM:
-#line 4696 "scanner.c"
+#line 4697 "scanner.c"
 		{
 			gchar* _tmp11_ = NULL;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4701,11 +4702,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp11_;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4705 "scanner.c"
+#line 4706 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_ACCESS_DENIED:
-#line 4709 "scanner.c"
+#line 4710 "scanner.c"
 		{
 			gchar* _tmp12_ = NULL;
 #line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4714,7 +4715,7 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp12_;
 #line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4718 "scanner.c"
+#line 4719 "scanner.c"
 		}
 		default:
 		{
@@ -4728,7 +4729,7 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp14_;
 #line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4732 "scanner.c"
+#line 4733 "scanner.c"
 		}
 	}
 }
@@ -4737,13 +4738,13 @@ static gchar* sane_status_to_string (SANE_Status status) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1282 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1282 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1282 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1282 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1282 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1282 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 4747 "scanner.c"
+#line 4748 "scanner.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -4756,100 +4757,100 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4778 "scanner.c"
+#line 4779 "scanner.c"
 				goto __catch14_g_regex_error;
 			}
-#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1284 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1284 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4787 "scanner.c"
+#line 4788 "scanner.c"
 		}
-#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) (-1), 0, _tmp7_, 0, &_inner_error_);
-#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4803 "scanner.c"
+#line 4804 "scanner.c"
 				goto __catch14_g_regex_error;
 			}
-#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4814 "scanner.c"
+#line 4815 "scanner.c"
 		}
-#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
-#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp5_ = NULL;
-#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		result = _tmp9_;
-#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp5_);
-#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1285 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1285 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
-#line 4828 "scanner.c"
+#line 4829 "scanner.c"
 	}
 	goto __finally14;
 	__catch14_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1287 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1287 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 4842 "scanner.c"
+#line 4843 "scanner.c"
 	}
 	__finally14:
-#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1283 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return NULL;
-#line 4853 "scanner.c"
+#line 4854 "scanner.c"
 	}
 }
 
@@ -4857,7 +4858,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 static gpointer _scan_device_ref0 (gpointer self) {
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_device_ref (self) : NULL;
-#line 4861 "scanner.c"
+#line 4862 "scanner.c"
 }
 
 
@@ -4866,7 +4867,7 @@ static gint _scanner_compare_devices_gcompare_func (gconstpointer a, gconstpoint
 	result = scanner_compare_devices ((ScanDevice*) a, (ScanDevice*) b);
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4870 "scanner.c"
+#line 4871 "scanner.c"
 }
 
 
@@ -4918,7 +4919,7 @@ static void scanner_do_redetect (Scanner* self) {
 	_tmp5_ = status;
 #line 339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
-#line 4922 "scanner.c"
+#line 4923 "scanner.c"
 		SANE_Status _tmp6_ = 0;
 		const gchar* _tmp7_ = NULL;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4933,23 +4934,23 @@ static void scanner_do_redetect (Scanner* self) {
 		self->priv->state = SCAN_STATE_IDLE;
 #line 344 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 4937 "scanner.c"
+#line 4938 "scanner.c"
 	}
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = NULL;
-#line 4941 "scanner.c"
+#line 4942 "scanner.c"
 	{
 		gint i = 0;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 4946 "scanner.c"
+#line 4947 "scanner.c"
 		{
 			gboolean _tmp8_ = FALSE;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp8_ = TRUE;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 4953 "scanner.c"
+#line 4954 "scanner.c"
 				SANE_Device** _tmp10_ = NULL;
 				gint _tmp10__length1 = 0;
 				gint _tmp11_ = 0;
@@ -5007,13 +5008,13 @@ static void scanner_do_redetect (Scanner* self) {
 				ScanDevice* _tmp55_ = NULL;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp8_) {
-#line 5011 "scanner.c"
+#line 5012 "scanner.c"
 					gint _tmp9_ = 0;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = i;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp9_ + 1;
-#line 5017 "scanner.c"
+#line 5018 "scanner.c"
 				}
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = FALSE;
@@ -5029,7 +5030,7 @@ static void scanner_do_redetect (Scanner* self) {
 				if (!(_tmp12_ != NULL)) {
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 5033 "scanner.c"
+#line 5034 "scanner.c"
 				}
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp13_ = device_list;
@@ -5114,7 +5115,7 @@ static void scanner_do_redetect (Scanner* self) {
 				_tmp41_ = vendor;
 #line 358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (g_strcmp0 (_tmp41_, "Hewlett-Packard") == 0) {
-#line 5117 "scanner.c"
+#line 5118 "scanner.c"
 					gchar* _tmp42_ = NULL;
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp42_ = g_strdup ("HP");
@@ -5122,7 +5123,7 @@ static void scanner_do_redetect (Scanner* self) {
 					_g_free0 (vendor);
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					vendor = _tmp42_;
-#line 5125 "scanner.c"
+#line 5126 "scanner.c"
 				}
 #line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp43_ = scan_device;
@@ -5164,7 +5165,7 @@ static void scanner_do_redetect (Scanner* self) {
 				_g_free0 (vendor);
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_scan_device_unref0 (scan_device);
-#line 5167 "scanner.c"
+#line 5168 "scanner.c"
 			}
 		}
 	}
@@ -5178,7 +5179,7 @@ static void scanner_do_redetect (Scanner* self) {
 	_tmp56_ = devices;
 #line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp56_ != NULL) {
-#line 5181 "scanner.c"
+#line 5182 "scanner.c"
 		ScanDevice* device = NULL;
 		GList* _tmp57_ = NULL;
 		gconstpointer _tmp58_ = NULL;
@@ -5206,13 +5207,13 @@ static void scanner_do_redetect (Scanner* self) {
 		self->priv->default_device = _tmp62_;
 #line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_device_unref0 (device);
-#line 5209 "scanner.c"
+#line 5210 "scanner.c"
 	} else {
 #line 380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (self->priv->default_device);
 #line 380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->default_device = NULL;
-#line 5215 "scanner.c"
+#line 5216 "scanner.c"
 	}
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp63_ = devices;
@@ -5228,7 +5229,7 @@ static void scanner_do_redetect (Scanner* self) {
 	_notify_unref0 (_tmp65_);
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (devices);
-#line 5231 "scanner.c"
+#line 5232 "scanner.c"
 }
 
 
@@ -5264,7 +5265,7 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 	_tmp6_ = _tmp5_->constraint_type;
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ == SANE_CONSTRAINT_RANGE) {
-#line 5267 "scanner.c"
+#line 5268 "scanner.c"
 		SANE_Option_Descriptor* _tmp7_ = NULL;
 		SANE_Range* _tmp8_ = NULL;
 		SANE_Word _tmp9_ = {0};
@@ -5285,15 +5286,15 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 		_tmp12_ = _tmp11_->min;
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = _tmp9_ != _tmp12_;
-#line 5288 "scanner.c"
+#line 5289 "scanner.c"
 	} else {
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = FALSE;
-#line 5292 "scanner.c"
+#line 5293 "scanner.c"
 	}
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_) {
-#line 5296 "scanner.c"
+#line 5297 "scanner.c"
 		gint _tmp13_ = 0;
 		gint _tmp14_ = 0;
 		gint _tmp15_ = 0;
@@ -5383,13 +5384,13 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 #line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:397: scale_int: scaling %d [min: %d, max: %d] to %d [min:" \
 " %d, max: %d]", _tmp29_, _tmp30_, _tmp31_, _tmp32_, (gint) _tmp35_, (gint) _tmp38_);
-#line 5385 "scanner.c"
+#line 5386 "scanner.c"
 	}
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = v;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 5391 "scanner.c"
+#line 5392 "scanner.c"
 }
 
 
@@ -5421,7 +5422,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 		result = FALSE;
 #line 408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 5423 "scanner.c"
+#line 5424 "scanner.c"
 	}
 #line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = handle;
@@ -5447,7 +5448,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 	_tmp9_ = status;
 #line 412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ != SANE_STATUS_GOOD) {
-#line 5449 "scanner.c"
+#line 5450 "scanner.c"
 		SANE_Option_Descriptor* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		SANE_Status _tmp12_ = 0;
@@ -5462,7 +5463,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 		_tmp13_ = sane_strstatus (_tmp12_);
 #line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:413: Error setting default option %s: %s", _tmp11_, _tmp13_);
-#line 5464 "scanner.c"
+#line 5465 "scanner.c"
 	}
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = status;
@@ -5470,7 +5471,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 	result = _tmp14_ == SANE_STATUS_GOOD;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 5472 "scanner.c"
+#line 5473 "scanner.c"
 }
 
 
@@ -5525,11 +5526,11 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	if (_tmp8_) {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = "SANE_TRUE";
-#line 5527 "scanner.c"
+#line 5528 "scanner.c"
 	} else {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = "SANE_FALSE";
-#line 5531 "scanner.c"
+#line 5532 "scanner.c"
 	}
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = _vala_result;
@@ -5537,11 +5538,11 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	if (_tmp10_) {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = "SANE_TRUE";
-#line 5539 "scanner.c"
+#line 5540 "scanner.c"
 	} else {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = "SANE_FALSE";
-#line 5543 "scanner.c"
+#line 5544 "scanner.c"
 	}
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = option_index;
@@ -5560,7 +5561,7 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	if (_result_) {
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 5561 "scanner.c"
+#line 5562 "scanner.c"
 	}
 }
 
@@ -5603,7 +5604,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 	_tmp4_ = _tmp3_->constraint_type;
 #line 433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_ == SANE_CONSTRAINT_RANGE) {
-#line 5604 "scanner.c"
+#line 5605 "scanner.c"
 		SANE_Option_Descriptor* _tmp5_ = NULL;
 		SANE_Range* _tmp6_ = NULL;
 		SANE_Word _tmp7_ = {0};
@@ -5623,7 +5624,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp7_ = _tmp6_->quant;
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp7_ != ((SANE_Word) 0)) {
-#line 5624 "scanner.c"
+#line 5625 "scanner.c"
 			SANE_Int _tmp8_ = {0};
 			SANE_Option_Descriptor* _tmp9_ = NULL;
 			SANE_Range* _tmp10_ = NULL;
@@ -5638,7 +5639,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp11_ = _tmp10_->quant;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp8_ * _tmp11_;
-#line 5639 "scanner.c"
+#line 5640 "scanner.c"
 		}
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = v;
@@ -5650,7 +5651,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp15_ = _tmp14_->min;
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp12_ < ((SANE_Int) _tmp15_)) {
-#line 5651 "scanner.c"
+#line 5652 "scanner.c"
 			SANE_Option_Descriptor* _tmp16_ = NULL;
 			SANE_Range* _tmp17_ = NULL;
 			SANE_Word _tmp18_ = {0};
@@ -5662,7 +5663,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp18_ = _tmp17_->min;
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp18_;
-#line 5663 "scanner.c"
+#line 5664 "scanner.c"
 		}
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = v;
@@ -5674,7 +5675,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp22_ = _tmp21_->max;
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp19_ > ((SANE_Int) _tmp22_)) {
-#line 5675 "scanner.c"
+#line 5676 "scanner.c"
 			SANE_Option_Descriptor* _tmp23_ = NULL;
 			SANE_Range* _tmp24_ = NULL;
 			SANE_Word _tmp25_ = {0};
@@ -5686,7 +5687,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp25_ = _tmp24_->max;
 #line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp25_;
-#line 5687 "scanner.c"
+#line 5688 "scanner.c"
 		}
 	} else {
 		SANE_Option_Descriptor* _tmp26_ = NULL;
@@ -5697,7 +5698,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp27_ = _tmp26_->constraint_type;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp27_ == SANE_CONSTRAINT_WORD_LIST) {
-#line 5698 "scanner.c"
+#line 5699 "scanner.c"
 			gint distance = 0;
 			gint nearest = 0;
 			gint _tmp46_ = 0;
@@ -5705,19 +5706,19 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			distance = G_MAXINT;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0;
-#line 5706 "scanner.c"
+#line 5707 "scanner.c"
 			{
 				gint i = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 5711 "scanner.c"
+#line 5712 "scanner.c"
 				{
 					gboolean _tmp28_ = FALSE;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp28_ = TRUE;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 5718 "scanner.c"
+#line 5719 "scanner.c"
 						gint _tmp30_ = 0;
 						SANE_Option_Descriptor* _tmp31_ = NULL;
 						SANE_Word* _tmp32_ = NULL;
@@ -5738,13 +5739,13 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 						gint _tmp43_ = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp28_) {
-#line 5739 "scanner.c"
+#line 5740 "scanner.c"
 							gint _tmp29_ = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp29_ = i;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp29_ + 1;
-#line 5745 "scanner.c"
+#line 5746 "scanner.c"
 						}
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp28_ = FALSE;
@@ -5762,7 +5763,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 						if (!(((SANE_Word) _tmp30_) < _tmp33_)) {
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 5763 "scanner.c"
+#line 5764 "scanner.c"
 						}
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp34_ = option;
@@ -5794,7 +5795,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 						_tmp43_ = distance;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp42_ < _tmp43_) {
-#line 5795 "scanner.c"
+#line 5796 "scanner.c"
 							gint _tmp44_ = 0;
 							gint _tmp45_ = 0;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5805,7 +5806,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 							_tmp45_ = x;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							nearest = _tmp45_;
-#line 5806 "scanner.c"
+#line 5807 "scanner.c"
 						}
 					}
 				}
@@ -5814,7 +5815,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp46_ = nearest;
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp46_;
-#line 5815 "scanner.c"
+#line 5816 "scanner.c"
 		}
 	}
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5848,7 +5849,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 	if (_result_) {
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 5848 "scanner.c"
+#line 5849 "scanner.c"
 	}
 }
 
@@ -5894,7 +5895,7 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 	_tmp4_ = _tmp3_->constraint_type;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_ == SANE_CONSTRAINT_RANGE) {
-#line 5894 "scanner.c"
+#line 5895 "scanner.c"
 		gdouble min = 0.0;
 		SANE_Option_Descriptor* _tmp5_ = NULL;
 		SANE_Range* _tmp6_ = NULL;
@@ -5935,13 +5936,13 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 		_tmp14_ = min;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp13_ < _tmp14_) {
-#line 5935 "scanner.c"
+#line 5936 "scanner.c"
 			gdouble _tmp15_ = 0.0;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = min;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp15_;
-#line 5941 "scanner.c"
+#line 5942 "scanner.c"
 		}
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = v;
@@ -5949,13 +5950,13 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 		_tmp17_ = max;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp16_ > _tmp17_) {
-#line 5949 "scanner.c"
+#line 5950 "scanner.c"
 			gdouble _tmp18_ = 0.0;
 #line 481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = max;
 #line 481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp18_;
-#line 5955 "scanner.c"
+#line 5956 "scanner.c"
 		}
 	} else {
 		SANE_Option_Descriptor* _tmp19_ = NULL;
@@ -5966,7 +5967,7 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 		_tmp20_ = _tmp19_->constraint_type;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ == SANE_CONSTRAINT_WORD_LIST) {
-#line 5966 "scanner.c"
+#line 5967 "scanner.c"
 			gdouble distance = 0.0;
 			gdouble nearest = 0.0;
 			gdouble _tmp40_ = 0.0;
@@ -5974,19 +5975,19 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 			distance = DBL_MAX;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0.0;
-#line 5974 "scanner.c"
+#line 5975 "scanner.c"
 			{
 				gint i = 0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 5979 "scanner.c"
+#line 5980 "scanner.c"
 				{
 					gboolean _tmp21_ = FALSE;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp21_ = TRUE;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 5986 "scanner.c"
+#line 5987 "scanner.c"
 						gint _tmp23_ = 0;
 						SANE_Option_Descriptor* _tmp24_ = NULL;
 						SANE_Word* _tmp25_ = NULL;
@@ -6005,13 +6006,13 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 						gdouble _tmp35_ = 0.0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp21_) {
-#line 6005 "scanner.c"
+#line 6006 "scanner.c"
 							gint _tmp22_ = 0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp22_ = i;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp22_ + 1;
-#line 6011 "scanner.c"
+#line 6012 "scanner.c"
 						}
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp21_ = FALSE;
@@ -6029,7 +6030,7 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 						if (!(((SANE_Word) _tmp23_) < _tmp26_)) {
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6029 "scanner.c"
+#line 6030 "scanner.c"
 						}
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp27_ = option;
@@ -6055,7 +6056,7 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 						_tmp35_ = distance;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp34_ < _tmp35_) {
-#line 6055 "scanner.c"
+#line 6056 "scanner.c"
 							gdouble _tmp36_ = 0.0;
 							gdouble _tmp37_ = 0.0;
 							gdouble _tmp38_ = 0.0;
@@ -6072,7 +6073,7 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 							_tmp39_ = x;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							nearest = _tmp39_;
-#line 6072 "scanner.c"
+#line 6073 "scanner.c"
 						}
 					}
 				}
@@ -6081,7 +6082,7 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 			_tmp40_ = nearest;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp40_;
-#line 6081 "scanner.c"
+#line 6082 "scanner.c"
 		}
 	}
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -6121,7 +6122,7 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 	if (_result_) {
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6120 "scanner.c"
+#line 6121 "scanner.c"
 	}
 }
 
@@ -6140,7 +6141,7 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 	_tmp1_ = _tmp0_->type;
 #line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SANE_TYPE_FIXED) {
-#line 6139 "scanner.c"
+#line 6140 "scanner.c"
 		SANE_Handle _tmp2_ = {0};
 		SANE_Option_Descriptor* _tmp3_ = NULL;
 		SANE_Int _tmp4_ = {0};
@@ -6158,7 +6159,7 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 		scanner_set_fixed_option (self, _tmp2_, _tmp3_, _tmp4_, _tmp5_, &_tmp6_);
 #line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_vala_result = _tmp6_;
-#line 6157 "scanner.c"
+#line 6158 "scanner.c"
 	} else {
 		SANE_Option_Descriptor* _tmp7_ = NULL;
 		SANE_Value_Type _tmp8_ = 0;
@@ -6168,7 +6169,7 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 		_tmp8_ = _tmp7_->type;
 #line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp8_ == SANE_TYPE_INT) {
-#line 6167 "scanner.c"
+#line 6168 "scanner.c"
 			gint r = 0;
 			SANE_Handle _tmp9_ = {0};
 			SANE_Option_Descriptor* _tmp10_ = NULL;
@@ -6195,20 +6196,20 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 			_tmp15_ = r;
 #line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_vala_result = (gdouble) _tmp15_;
-#line 6194 "scanner.c"
+#line 6195 "scanner.c"
 		} else {
 #line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_vala_result = 0.0;
 #line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:520: Unable to set unsupported option type");
-#line 6200 "scanner.c"
+#line 6201 "scanner.c"
 		}
 	}
 #line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
 #line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6207 "scanner.c"
+#line 6208 "scanner.c"
 	}
 }
 
@@ -6238,7 +6239,7 @@ static void scanner_set_option_to_max (Scanner* self, SANE_Handle handle, SANE_O
 	if (_tmp1_ != SANE_CONSTRAINT_RANGE) {
 #line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 6237 "scanner.c"
+#line 6238 "scanner.c"
 	}
 #line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = handle;
@@ -6265,7 +6266,7 @@ static void scanner_set_option_to_max (Scanner* self, SANE_Handle handle, SANE_O
 "on.range.max) -> (%s)", (gint) _tmp7_, _tmp10_);
 #line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp10_);
-#line 6263 "scanner.c"
+#line 6264 "scanner.c"
 }
 
 
@@ -6273,17 +6274,17 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 996 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 996 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
-#line 6281 "scanner.c"
+#line 6282 "scanner.c"
 }
 
 
@@ -6350,14 +6351,14 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 	_s_size_ = s_length1;
 #line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	i = 0;
-#line 6348 "scanner.c"
+#line 6349 "scanner.c"
 	{
 		gboolean _tmp6_ = FALSE;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = TRUE;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		while (TRUE) {
-#line 6355 "scanner.c"
+#line 6356 "scanner.c"
 			gboolean _tmp8_ = FALSE;
 			gint _tmp9_ = 0;
 			SANE_Option_Descriptor* _tmp10_ = NULL;
@@ -6371,13 +6372,13 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 			gchar _tmp20_ = '\0';
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp6_) {
-#line 6369 "scanner.c"
+#line 6370 "scanner.c"
 				gint _tmp7_ = 0;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = i;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = _tmp7_ + 1;
-#line 6375 "scanner.c"
+#line 6376 "scanner.c"
 			}
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = FALSE;
@@ -6389,7 +6390,7 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 			_tmp11_ = _tmp10_->size;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (((SANE_Int) _tmp9_) < (_tmp11_ - 1)) {
-#line 6387 "scanner.c"
+#line 6388 "scanner.c"
 				const gchar* _tmp12_ = NULL;
 				gint _tmp13_ = 0;
 				gchar _tmp14_ = '\0';
@@ -6401,17 +6402,17 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 				_tmp14_ = string_get (_tmp12_, (glong) _tmp13_);
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = _tmp14_ != '\0';
-#line 6399 "scanner.c"
+#line 6400 "scanner.c"
 			} else {
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = FALSE;
-#line 6403 "scanner.c"
+#line 6404 "scanner.c"
 			}
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (!_tmp8_) {
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 6409 "scanner.c"
+#line 6410 "scanner.c"
 			}
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = s;
@@ -6429,7 +6430,7 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 			_tmp15_[_tmp16_] = _tmp19_;
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp20_ = _tmp15_[_tmp16_];
-#line 6427 "scanner.c"
+#line 6428 "scanner.c"
 		}
 	}
 #line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -6487,15 +6488,15 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 	if (_result_) {
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6484 "scanner.c"
+#line 6485 "scanner.c"
 	} else {
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
-#line 6488 "scanner.c"
+#line 6489 "scanner.c"
 	}
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 6492 "scanner.c"
+#line 6493 "scanner.c"
 }
 
 
@@ -6523,19 +6524,19 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 	_tmp3_ = _tmp2_->constraint_type;
 #line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp3_ == SANE_CONSTRAINT_STRING_LIST, FALSE);
-#line 6520 "scanner.c"
+#line 6521 "scanner.c"
 	{
 		gint i = 0;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 6525 "scanner.c"
+#line 6526 "scanner.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = TRUE;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 6532 "scanner.c"
+#line 6533 "scanner.c"
 				gchar** _tmp6_ = NULL;
 				gint _tmp6__length1 = 0;
 				gint _tmp7_ = 0;
@@ -6548,13 +6549,13 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 				const gchar* _tmp25_ = NULL;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp4_) {
-#line 6545 "scanner.c"
+#line 6546 "scanner.c"
 					gint _tmp5_ = 0;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp5_ = i;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp5_ + 1;
-#line 6551 "scanner.c"
+#line 6552 "scanner.c"
 				}
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp4_ = FALSE;
@@ -6570,18 +6571,18 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 				if (!(_tmp8_ != NULL)) {
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 6567 "scanner.c"
+#line 6568 "scanner.c"
 				}
 #line 558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				j = 0;
-#line 6571 "scanner.c"
+#line 6572 "scanner.c"
 				{
 					gboolean _tmp9_ = FALSE;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = TRUE;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 6578 "scanner.c"
+#line 6579 "scanner.c"
 						SANE_Option_Descriptor* _tmp11_ = NULL;
 						gchar** _tmp12_ = NULL;
 						gint _tmp12__length1 = 0;
@@ -6598,13 +6599,13 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 						const gchar* _tmp21_ = NULL;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp9_) {
-#line 6595 "scanner.c"
+#line 6596 "scanner.c"
 							gint _tmp10_ = 0;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp10_ = j;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							j = _tmp10_ + 1;
-#line 6601 "scanner.c"
+#line 6602 "scanner.c"
 						}
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp9_ = FALSE;
@@ -6613,7 +6614,7 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp12_ = _tmp11_->constraint.string_list;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp12__length1 = -1;
+						_tmp12__length1 = _vala_array_length (_tmp11_->constraint.string_list);
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp13_ = j;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -6622,7 +6623,7 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 						if (!(_tmp14_ != NULL)) {
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6619 "scanner.c"
+#line 6620 "scanner.c"
 						}
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp15_ = values;
@@ -6637,7 +6638,7 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp19_ = _tmp18_->constraint.string_list;
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp19__length1 = -1;
+						_tmp19__length1 = _vala_array_length (_tmp18_->constraint.string_list);
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp20_ = j;
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -6646,7 +6647,7 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 						if (g_strcmp0 (_tmp17_, _tmp21_) == 0) {
 #line 562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6643 "scanner.c"
+#line 6644 "scanner.c"
 						}
 					}
 				}
@@ -6655,14 +6656,14 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp23_ = _tmp22_->constraint.string_list;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp23__length1 = -1;
+				_tmp23__length1 = _vala_array_length (_tmp22_->constraint.string_list);
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp24_ = j;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp25_ = _tmp23_[_tmp24_];
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp25_ != NULL) {
-#line 6659 "scanner.c"
+#line 6660 "scanner.c"
 					SANE_Handle _tmp26_ = {0};
 					SANE_Option_Descriptor* _tmp27_ = NULL;
 					SANE_Int _tmp28_ = {0};
@@ -6698,15 +6699,15 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 					if (_result_) {
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						*_result_ = _vala_result;
-#line 6695 "scanner.c"
+#line 6696 "scanner.c"
 					} else {
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (_vala_result);
-#line 6699 "scanner.c"
+#line 6700 "scanner.c"
 					}
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
-#line 6703 "scanner.c"
+#line 6704 "scanner.c"
 				}
 			}
 		}
@@ -6723,15 +6724,15 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 	if (_result_) {
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6720 "scanner.c"
+#line 6721 "scanner.c"
 	} else {
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
-#line 6724 "scanner.c"
+#line 6725 "scanner.c"
 	}
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 6728 "scanner.c"
+#line 6729 "scanner.c"
 }
 
 
@@ -6778,7 +6779,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	_tmp3_ = _tmp2_->name;
 #line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp3_, "") != 0) {
-#line 6775 "scanner.c"
+#line 6776 "scanner.c"
 		const gchar* _tmp4_ = NULL;
 		SANE_Option_Descriptor* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -6803,7 +6804,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		s = _tmp9_;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp8_);
-#line 6800 "scanner.c"
+#line 6801 "scanner.c"
 	}
 #line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = option;
@@ -6811,7 +6812,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	_tmp11_ = _tmp10_->title;
 #line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp11_, "") != 0) {
-#line 6808 "scanner.c"
+#line 6809 "scanner.c"
 		const gchar* _tmp12_ = NULL;
 		SANE_Option_Descriptor* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
@@ -6836,7 +6837,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		s = _tmp17_;
 #line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp16_);
-#line 6833 "scanner.c"
+#line 6834 "scanner.c"
 	}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = option;
@@ -6846,7 +6847,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	switch (_tmp19_) {
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BOOL:
-#line 6843 "scanner.c"
+#line 6844 "scanner.c"
 		{
 			const gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
@@ -6860,11 +6861,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp21_;
 #line 587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6857 "scanner.c"
+#line 6858 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_INT:
-#line 6861 "scanner.c"
+#line 6862 "scanner.c"
 		{
 			const gchar* _tmp22_ = NULL;
 			gchar* _tmp23_ = NULL;
@@ -6878,11 +6879,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp23_;
 #line 590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6875 "scanner.c"
+#line 6876 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_FIXED:
-#line 6879 "scanner.c"
+#line 6880 "scanner.c"
 		{
 			const gchar* _tmp24_ = NULL;
 			gchar* _tmp25_ = NULL;
@@ -6896,11 +6897,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp25_;
 #line 593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6893 "scanner.c"
+#line 6894 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_STRING:
-#line 6897 "scanner.c"
+#line 6898 "scanner.c"
 		{
 			const gchar* _tmp26_ = NULL;
 			gchar* _tmp27_ = NULL;
@@ -6914,11 +6915,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp27_;
 #line 596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6911 "scanner.c"
+#line 6912 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BUTTON:
-#line 6915 "scanner.c"
+#line 6916 "scanner.c"
 		{
 			const gchar* _tmp28_ = NULL;
 			gchar* _tmp29_ = NULL;
@@ -6932,11 +6933,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp29_;
 #line 599 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6929 "scanner.c"
+#line 6930 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_GROUP:
-#line 6933 "scanner.c"
+#line 6934 "scanner.c"
 		{
 			const gchar* _tmp30_ = NULL;
 			gchar* _tmp31_ = NULL;
@@ -6950,7 +6951,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp31_;
 #line 602 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6947 "scanner.c"
+#line 6948 "scanner.c"
 		}
 		default:
 		{
@@ -6980,7 +6981,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_g_free0 (_tmp36_);
 #line 605 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6977 "scanner.c"
+#line 6978 "scanner.c"
 		}
 	}
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7009,15 +7010,15 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	switch (_tmp45_) {
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_NONE:
-#line 7006 "scanner.c"
+#line 7007 "scanner.c"
 		{
 #line 613 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7010 "scanner.c"
+#line 7011 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PIXEL:
-#line 7014 "scanner.c"
+#line 7015 "scanner.c"
 		{
 			const gchar* _tmp46_ = NULL;
 			gchar* _tmp47_ = NULL;
@@ -7031,11 +7032,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp47_;
 #line 616 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7028 "scanner.c"
+#line 7029 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_BIT:
-#line 7032 "scanner.c"
+#line 7033 "scanner.c"
 		{
 			const gchar* _tmp48_ = NULL;
 			gchar* _tmp49_ = NULL;
@@ -7049,11 +7050,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp49_;
 #line 619 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7046 "scanner.c"
+#line 7047 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MM:
-#line 7050 "scanner.c"
+#line 7051 "scanner.c"
 		{
 			const gchar* _tmp50_ = NULL;
 			gchar* _tmp51_ = NULL;
@@ -7067,11 +7068,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp51_;
 #line 622 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7064 "scanner.c"
+#line 7065 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_DPI:
-#line 7068 "scanner.c"
+#line 7069 "scanner.c"
 		{
 			const gchar* _tmp52_ = NULL;
 			gchar* _tmp53_ = NULL;
@@ -7085,11 +7086,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp53_;
 #line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7082 "scanner.c"
+#line 7083 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PERCENT:
-#line 7086 "scanner.c"
+#line 7087 "scanner.c"
 		{
 			const gchar* _tmp54_ = NULL;
 			gchar* _tmp55_ = NULL;
@@ -7103,11 +7104,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp55_;
 #line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7100 "scanner.c"
+#line 7101 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MICROSECOND:
-#line 7104 "scanner.c"
+#line 7105 "scanner.c"
 		{
 			const gchar* _tmp56_ = NULL;
 			gchar* _tmp57_ = NULL;
@@ -7121,7 +7122,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp57_;
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7118 "scanner.c"
+#line 7119 "scanner.c"
 		}
 		default:
 		{
@@ -7151,7 +7152,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_g_free0 (_tmp62_);
 #line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7148 "scanner.c"
+#line 7149 "scanner.c"
 		}
 	}
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7162,7 +7163,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	switch (_tmp65_) {
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_RANGE:
-#line 7159 "scanner.c"
+#line 7160 "scanner.c"
 		{
 			SANE_Option_Descriptor* _tmp66_ = NULL;
 			SANE_Value_Type _tmp67_ = 0;
@@ -7172,7 +7173,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp67_ = _tmp66_->type;
 #line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp67_ == SANE_TYPE_FIXED) {
-#line 7169 "scanner.c"
+#line 7170 "scanner.c"
 				const gchar* _tmp68_ = NULL;
 				SANE_Option_Descriptor* _tmp69_ = NULL;
 				SANE_Range* _tmp70_ = NULL;
@@ -7224,7 +7225,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				s = _tmp82_;
 #line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp81_);
-#line 7221 "scanner.c"
+#line 7222 "scanner.c"
 			} else {
 				const gchar* _tmp83_ = NULL;
 				SANE_Option_Descriptor* _tmp84_ = NULL;
@@ -7271,15 +7272,15 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				s = _tmp95_;
 #line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp94_);
-#line 7268 "scanner.c"
+#line 7269 "scanner.c"
 			}
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7272 "scanner.c"
+#line 7273 "scanner.c"
 		}
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_WORD_LIST:
-#line 7276 "scanner.c"
+#line 7277 "scanner.c"
 		{
 			const gchar* _tmp96_ = NULL;
 			gchar* _tmp97_ = NULL;
@@ -7293,19 +7294,19 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_g_free0 (s);
 #line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp97_;
-#line 7290 "scanner.c"
+#line 7291 "scanner.c"
 			{
 				gint i = 0;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 7295 "scanner.c"
+#line 7296 "scanner.c"
 				{
 					gboolean _tmp98_ = FALSE;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp98_ = TRUE;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 7302 "scanner.c"
+#line 7303 "scanner.c"
 						gint _tmp100_ = 0;
 						SANE_Option_Descriptor* _tmp101_ = NULL;
 						SANE_Word* _tmp102_ = NULL;
@@ -7316,13 +7317,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						SANE_Value_Type _tmp108_ = 0;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp98_) {
-#line 7313 "scanner.c"
+#line 7314 "scanner.c"
 							gint _tmp99_ = 0;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp99_ = i;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp99_ + 1;
-#line 7319 "scanner.c"
+#line 7320 "scanner.c"
 						}
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp98_ = FALSE;
@@ -7340,13 +7341,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						if (!(((SANE_Word) _tmp100_) < _tmp103_)) {
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 7337 "scanner.c"
+#line 7338 "scanner.c"
 						}
 #line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp104_ = i;
 #line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp104_ != 0) {
-#line 7343 "scanner.c"
+#line 7344 "scanner.c"
 							const gchar* _tmp105_ = NULL;
 							gchar* _tmp106_ = NULL;
 #line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7357,7 +7358,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							_g_free0 (s);
 #line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp106_;
-#line 7354 "scanner.c"
+#line 7355 "scanner.c"
 						}
 #line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp107_ = option;
@@ -7365,7 +7366,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						_tmp108_ = _tmp107_->type;
 #line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp108_ == SANE_TYPE_INT) {
-#line 7362 "scanner.c"
+#line 7363 "scanner.c"
 							const gchar* _tmp109_ = NULL;
 							SANE_Option_Descriptor* _tmp110_ = NULL;
 							SANE_Word* _tmp111_ = NULL;
@@ -7399,7 +7400,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							s = _tmp116_;
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (_tmp115_);
-#line 7396 "scanner.c"
+#line 7397 "scanner.c"
 						} else {
 							const gchar* _tmp117_ = NULL;
 							SANE_Option_Descriptor* _tmp118_ = NULL;
@@ -7437,7 +7438,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							s = _tmp125_;
 #line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (_tmp124_);
-#line 7434 "scanner.c"
+#line 7435 "scanner.c"
 						}
 					}
 				}
@@ -7452,11 +7453,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp127_;
 #line 657 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7449 "scanner.c"
+#line 7450 "scanner.c"
 		}
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_STRING_LIST:
-#line 7453 "scanner.c"
+#line 7454 "scanner.c"
 		{
 			const gchar* _tmp128_ = NULL;
 			gchar* _tmp129_ = NULL;
@@ -7470,19 +7471,19 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_g_free0 (s);
 #line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp129_;
-#line 7467 "scanner.c"
+#line 7468 "scanner.c"
 			{
 				gint i = 0;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 7472 "scanner.c"
+#line 7473 "scanner.c"
 				{
 					gboolean _tmp130_ = FALSE;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp130_ = TRUE;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 7479 "scanner.c"
+#line 7480 "scanner.c"
 						SANE_Option_Descriptor* _tmp132_ = NULL;
 						gchar** _tmp133_ = NULL;
 						gint _tmp133__length1 = 0;
@@ -7500,13 +7501,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						gchar* _tmp146_ = NULL;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp130_) {
-#line 7497 "scanner.c"
+#line 7498 "scanner.c"
 							gint _tmp131_ = 0;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp131_ = i;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp131_ + 1;
-#line 7503 "scanner.c"
+#line 7504 "scanner.c"
 						}
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp130_ = FALSE;
@@ -7515,7 +7516,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp133_ = _tmp132_->constraint.string_list;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp133__length1 = -1;
+						_tmp133__length1 = _vala_array_length (_tmp132_->constraint.string_list);
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp134_ = i;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7524,13 +7525,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						if (!(_tmp135_ != NULL)) {
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 7521 "scanner.c"
+#line 7522 "scanner.c"
 						}
 #line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp136_ = i;
 #line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp136_ != 0) {
-#line 7527 "scanner.c"
+#line 7528 "scanner.c"
 							const gchar* _tmp137_ = NULL;
 							gchar* _tmp138_ = NULL;
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7541,7 +7542,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 							_g_free0 (s);
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							s = _tmp138_;
-#line 7538 "scanner.c"
+#line 7539 "scanner.c"
 						}
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp139_ = s;
@@ -7550,7 +7551,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp141_ = _tmp140_->constraint.string_list;
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp141__length1 = -1;
+						_tmp141__length1 = _vala_array_length (_tmp140_->constraint.string_list);
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp142_ = i;
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7567,7 +7568,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 						s = _tmp146_;
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (_tmp145_);
-#line 7564 "scanner.c"
+#line 7565 "scanner.c"
 					}
 				}
 			}
@@ -7581,13 +7582,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp148_;
 #line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7578 "scanner.c"
+#line 7579 "scanner.c"
 		}
 		default:
 		{
 #line 669 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7584 "scanner.c"
+#line 7585 "scanner.c"
 		}
 	}
 #line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7600,7 +7601,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	_tmp151_ = cap;
 #line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp151_ != ((SANE_Int) 0)) {
-#line 7597 "scanner.c"
+#line 7598 "scanner.c"
 		const gchar* _tmp152_ = NULL;
 		gchar* _tmp153_ = NULL;
 		SANE_Int _tmp154_ = {0};
@@ -7623,7 +7624,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		_tmp154_ = cap;
 #line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp154_ & SANE_CAP_SOFT_SELECT) != ((SANE_Int) 0)) {
-#line 7620 "scanner.c"
+#line 7621 "scanner.c"
 			const gchar* _tmp155_ = NULL;
 			const gchar* _tmp158_ = NULL;
 			gchar* _tmp159_ = NULL;
@@ -7632,7 +7633,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp155_ = s;
 #line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp155_, "") != 0) {
-#line 7629 "scanner.c"
+#line 7630 "scanner.c"
 				const gchar* _tmp156_ = NULL;
 				gchar* _tmp157_ = NULL;
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7643,7 +7644,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp157_;
-#line 7640 "scanner.c"
+#line 7641 "scanner.c"
 			}
 #line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp158_ = s;
@@ -7657,13 +7658,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp160_ = cap;
 #line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp160_ & (~SANE_CAP_SOFT_SELECT);
-#line 7654 "scanner.c"
+#line 7655 "scanner.c"
 		}
 #line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp161_ = cap;
 #line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp161_ & SANE_CAP_HARD_SELECT) != ((SANE_Int) 0)) {
-#line 7660 "scanner.c"
+#line 7661 "scanner.c"
 			const gchar* _tmp162_ = NULL;
 			const gchar* _tmp165_ = NULL;
 			gchar* _tmp166_ = NULL;
@@ -7672,7 +7673,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp162_ = s;
 #line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp162_, "") != 0) {
-#line 7669 "scanner.c"
+#line 7670 "scanner.c"
 				const gchar* _tmp163_ = NULL;
 				gchar* _tmp164_ = NULL;
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7683,7 +7684,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp164_;
-#line 7680 "scanner.c"
+#line 7681 "scanner.c"
 			}
 #line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp165_ = s;
@@ -7697,13 +7698,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp167_ = cap;
 #line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp167_ & (~SANE_CAP_HARD_SELECT);
-#line 7694 "scanner.c"
+#line 7695 "scanner.c"
 		}
 #line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp168_ = cap;
 #line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp168_ & SANE_CAP_SOFT_DETECT) != ((SANE_Int) 0)) {
-#line 7700 "scanner.c"
+#line 7701 "scanner.c"
 			const gchar* _tmp169_ = NULL;
 			const gchar* _tmp172_ = NULL;
 			gchar* _tmp173_ = NULL;
@@ -7712,7 +7713,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp169_ = s;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp169_, "") != 0) {
-#line 7709 "scanner.c"
+#line 7710 "scanner.c"
 				const gchar* _tmp170_ = NULL;
 				gchar* _tmp171_ = NULL;
 #line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7723,7 +7724,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp171_;
-#line 7720 "scanner.c"
+#line 7721 "scanner.c"
 			}
 #line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp172_ = s;
@@ -7737,13 +7738,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp174_ = cap;
 #line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp174_ & (~SANE_CAP_SOFT_DETECT);
-#line 7734 "scanner.c"
+#line 7735 "scanner.c"
 		}
 #line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp175_ = cap;
 #line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp175_ & SANE_CAP_EMULATED) != ((SANE_Int) 0)) {
-#line 7740 "scanner.c"
+#line 7741 "scanner.c"
 			const gchar* _tmp176_ = NULL;
 			const gchar* _tmp179_ = NULL;
 			gchar* _tmp180_ = NULL;
@@ -7752,7 +7753,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp176_ = s;
 #line 699 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp176_, "") != 0) {
-#line 7749 "scanner.c"
+#line 7750 "scanner.c"
 				const gchar* _tmp177_ = NULL;
 				gchar* _tmp178_ = NULL;
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7763,7 +7764,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp178_;
-#line 7760 "scanner.c"
+#line 7761 "scanner.c"
 			}
 #line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp179_ = s;
@@ -7777,13 +7778,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp181_ = cap;
 #line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp181_ & (~SANE_CAP_EMULATED);
-#line 7774 "scanner.c"
+#line 7775 "scanner.c"
 		}
 #line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp182_ = cap;
 #line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp182_ & SANE_CAP_AUTOMATIC) != ((SANE_Int) 0)) {
-#line 7780 "scanner.c"
+#line 7781 "scanner.c"
 			const gchar* _tmp183_ = NULL;
 			const gchar* _tmp186_ = NULL;
 			gchar* _tmp187_ = NULL;
@@ -7792,7 +7793,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp183_ = s;
 #line 706 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp183_, "") != 0) {
-#line 7789 "scanner.c"
+#line 7790 "scanner.c"
 				const gchar* _tmp184_ = NULL;
 				gchar* _tmp185_ = NULL;
 #line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7803,7 +7804,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp185_;
-#line 7800 "scanner.c"
+#line 7801 "scanner.c"
 			}
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp186_ = s;
@@ -7817,13 +7818,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp188_ = cap;
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp188_ & (~SANE_CAP_AUTOMATIC);
-#line 7814 "scanner.c"
+#line 7815 "scanner.c"
 		}
 #line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp189_ = cap;
 #line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp189_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
-#line 7820 "scanner.c"
+#line 7821 "scanner.c"
 			const gchar* _tmp190_ = NULL;
 			const gchar* _tmp193_ = NULL;
 			gchar* _tmp194_ = NULL;
@@ -7832,7 +7833,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp190_ = s;
 #line 713 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp190_, "") != 0) {
-#line 7829 "scanner.c"
+#line 7830 "scanner.c"
 				const gchar* _tmp191_ = NULL;
 				gchar* _tmp192_ = NULL;
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7843,7 +7844,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp192_;
-#line 7840 "scanner.c"
+#line 7841 "scanner.c"
 			}
 #line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp193_ = s;
@@ -7857,13 +7858,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp195_ = cap;
 #line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp195_ & (~SANE_CAP_INACTIVE);
-#line 7854 "scanner.c"
+#line 7855 "scanner.c"
 		}
 #line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp196_ = cap;
 #line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if ((_tmp196_ & SANE_CAP_ADVANCED) != ((SANE_Int) 0)) {
-#line 7860 "scanner.c"
+#line 7861 "scanner.c"
 			const gchar* _tmp197_ = NULL;
 			const gchar* _tmp200_ = NULL;
 			gchar* _tmp201_ = NULL;
@@ -7872,7 +7873,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp197_ = s;
 #line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp197_, "") != 0) {
-#line 7869 "scanner.c"
+#line 7870 "scanner.c"
 				const gchar* _tmp198_ = NULL;
 				gchar* _tmp199_ = NULL;
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7883,7 +7884,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp199_;
-#line 7880 "scanner.c"
+#line 7881 "scanner.c"
 			}
 #line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp200_ = s;
@@ -7897,13 +7898,13 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp202_ = cap;
 #line 723 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			cap = _tmp202_ & (~SANE_CAP_ADVANCED);
-#line 7894 "scanner.c"
+#line 7895 "scanner.c"
 		}
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp203_ = cap;
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp203_ != ((SANE_Int) 0)) {
-#line 7900 "scanner.c"
+#line 7901 "scanner.c"
 			const gchar* _tmp204_ = NULL;
 			const gchar* _tmp207_ = NULL;
 			SANE_Int _tmp208_ = {0};
@@ -7914,7 +7915,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp204_ = s;
 #line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (g_strcmp0 (_tmp204_, "") != 0) {
-#line 7911 "scanner.c"
+#line 7912 "scanner.c"
 				const gchar* _tmp205_ = NULL;
 				gchar* _tmp206_ = NULL;
 #line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7925,7 +7926,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				_g_free0 (s);
 #line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				s = _tmp206_;
-#line 7922 "scanner.c"
+#line 7923 "scanner.c"
 			}
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp207_ = s;
@@ -7943,7 +7944,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp211_;
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (_tmp210_);
-#line 7940 "scanner.c"
+#line 7941 "scanner.c"
 		}
 	}
 #line 734 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7956,7 +7957,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	_tmp214_ = _tmp213_->desc;
 #line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp214_ != NULL) {
-#line 7953 "scanner.c"
+#line 7954 "scanner.c"
 		SANE_Option_Descriptor* _tmp215_ = NULL;
 		const gchar* _tmp216_ = NULL;
 #line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7965,11 +7966,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		_tmp216_ = _tmp215_->desc;
 #line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:737:   Description: %s", _tmp216_);
-#line 7962 "scanner.c"
+#line 7963 "scanner.c"
 	}
 #line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (s);
-#line 7966 "scanner.c"
+#line 7967 "scanner.c"
 }
 
 
@@ -8004,19 +8005,19 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 	_tmp6_ = g_async_queue_pop (_tmp5_);
 #line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials = (Credentials*) _tmp6_;
-#line 8001 "scanner.c"
+#line 8002 "scanner.c"
 	{
 		gint i = 0;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 8006 "scanner.c"
+#line 8007 "scanner.c"
 		{
 			gboolean _tmp7_ = FALSE;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = TRUE;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 8013 "scanner.c"
+#line 8014 "scanner.c"
 				gboolean _tmp9_ = FALSE;
 				Credentials* _tmp10_ = NULL;
 				const gchar* _tmp11_ = NULL;
@@ -8032,13 +8033,13 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				gchar _tmp22_ = '\0';
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp7_) {
-#line 8029 "scanner.c"
+#line 8030 "scanner.c"
 					gint _tmp8_ = 0;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp8_ = i;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp8_ + 1;
-#line 8035 "scanner.c"
+#line 8036 "scanner.c"
 				}
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = FALSE;
@@ -8052,7 +8053,7 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				_tmp13_ = string_get (_tmp11_, (glong) _tmp12_);
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp13_ != '\0') {
-#line 8049 "scanner.c"
+#line 8050 "scanner.c"
 					gint _tmp14_ = 0;
 					gint _tmp15_ = 0;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8061,17 +8062,17 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 					_tmp15_ = SANE_MAX_USERNAME_LEN;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = _tmp14_ < _tmp15_;
-#line 8058 "scanner.c"
+#line 8059 "scanner.c"
 				} else {
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp9_ = FALSE;
-#line 8062 "scanner.c"
+#line 8063 "scanner.c"
 				}
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp9_) {
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 8068 "scanner.c"
+#line 8069 "scanner.c"
 				}
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp16_ = username;
@@ -8091,7 +8092,7 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				_tmp16_[_tmp17_] = _tmp21_;
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp22_ = _tmp16_[_tmp17_];
-#line 8088 "scanner.c"
+#line 8089 "scanner.c"
 			}
 		}
 	}
@@ -8099,14 +8100,14 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 		gint i = 0;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 8096 "scanner.c"
+#line 8097 "scanner.c"
 		{
 			gboolean _tmp23_ = FALSE;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp23_ = TRUE;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 8103 "scanner.c"
+#line 8104 "scanner.c"
 				gboolean _tmp25_ = FALSE;
 				Credentials* _tmp26_ = NULL;
 				const gchar* _tmp27_ = NULL;
@@ -8122,13 +8123,13 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				gchar _tmp38_ = '\0';
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp23_) {
-#line 8119 "scanner.c"
+#line 8120 "scanner.c"
 					gint _tmp24_ = 0;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp24_ = i;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					i = _tmp24_ + 1;
-#line 8125 "scanner.c"
+#line 8126 "scanner.c"
 				}
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp23_ = FALSE;
@@ -8142,7 +8143,7 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				_tmp29_ = string_get (_tmp27_, (glong) _tmp28_);
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp29_ != '\0') {
-#line 8139 "scanner.c"
+#line 8140 "scanner.c"
 					gint _tmp30_ = 0;
 					gint _tmp31_ = 0;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8151,17 +8152,17 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 					_tmp31_ = SANE_MAX_USERNAME_LEN;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp25_ = _tmp30_ < _tmp31_;
-#line 8148 "scanner.c"
+#line 8149 "scanner.c"
 				} else {
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp25_ = FALSE;
-#line 8152 "scanner.c"
+#line 8153 "scanner.c"
 				}
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (!_tmp25_) {
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 8158 "scanner.c"
+#line 8159 "scanner.c"
 				}
 #line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp32_ = password;
@@ -8181,20 +8182,20 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 				_tmp32_[_tmp33_] = _tmp37_;
 #line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp38_ = _tmp32_[_tmp33_];
-#line 8178 "scanner.c"
+#line 8179 "scanner.c"
 			}
 		}
 	}
 #line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
-#line 8184 "scanner.c"
+#line 8185 "scanner.c"
 }
 
 
 static gpointer _credentials_ref0 (gpointer self) {
 #line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? credentials_ref (self) : NULL;
-#line 8191 "scanner.c"
+#line 8192 "scanner.c"
 }
 
 
@@ -8241,7 +8242,7 @@ void scanner_authorize (Scanner* self, const gchar* username, const gchar* passw
 	g_async_queue_push (_tmp5_, _tmp6_);
 #line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
-#line 8238 "scanner.c"
+#line 8239 "scanner.c"
 }
 
 
@@ -8253,7 +8254,7 @@ static void scanner_close_device (Scanner* self) {
 	_tmp0_ = self->priv->have_handle;
 #line 761 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 8250 "scanner.c"
+#line 8251 "scanner.c"
 		SANE_Handle _tmp1_ = {0};
 		SANE_Handle _tmp2_ = {0};
 #line 763 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8274,7 +8275,7 @@ static void scanner_close_device (Scanner* self) {
 		_g_hash_table_unref0 (self->priv->options);
 #line 769 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->options = NULL;
-#line 8271 "scanner.c"
+#line 8272 "scanner.c"
 	}
 #line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
@@ -8290,7 +8291,7 @@ static void scanner_close_device (Scanner* self) {
 	self->priv->job_queue = NULL;
 #line 775 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
-#line 8287 "scanner.c"
+#line 8288 "scanner.c"
 }
 
 
@@ -8319,21 +8320,21 @@ static void scanner_fail_scan (Scanner* self, gint error_code, const gchar* erro
 	scanner_notify (self, (Notify*) _tmp3_);
 #line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp3_);
-#line 8316 "scanner.c"
+#line 8317 "scanner.c"
 }
 
 
 static gpointer _request_ref0 (gpointer self) {
 #line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? request_ref (self) : NULL;
-#line 8323 "scanner.c"
+#line 8324 "scanner.c"
 }
 
 
 static gpointer _scan_job_ref0 (gpointer self) {
 #line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_job_ref (self) : NULL;
-#line 8330 "scanner.c"
+#line 8331 "scanner.c"
 }
 
 
@@ -8348,29 +8349,29 @@ static gboolean scanner_handle_requests (Scanner* self) {
 	_tmp1_ = self->priv->state;
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SCAN_STATE_IDLE) {
-#line 8345 "scanner.c"
+#line 8346 "scanner.c"
 		gboolean _tmp2_ = FALSE;
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = self->priv->need_redetect;
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
-#line 8351 "scanner.c"
+#line 8352 "scanner.c"
 	} else {
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 8355 "scanner.c"
+#line 8356 "scanner.c"
 	}
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
 #line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_REDETECT;
-#line 8361 "scanner.c"
+#line 8362 "scanner.c"
 	}
 #line 792 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_count = 0;
 #line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
-#line 8367 "scanner.c"
+#line 8368 "scanner.c"
 		Request* request = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
@@ -8381,23 +8382,23 @@ static gboolean scanner_handle_requests (Scanner* self) {
 		_tmp5_ = self->priv->state;
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp5_ == SCAN_STATE_IDLE) {
-#line 8378 "scanner.c"
+#line 8379 "scanner.c"
 			gint _tmp6_ = 0;
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = request_count;
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = _tmp6_ == 0;
-#line 8384 "scanner.c"
+#line 8385 "scanner.c"
 		} else {
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = FALSE;
-#line 8388 "scanner.c"
+#line 8389 "scanner.c"
 		}
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp4_) {
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = TRUE;
-#line 8394 "scanner.c"
+#line 8395 "scanner.c"
 		} else {
 			GAsyncQueue* _tmp7_ = NULL;
 			gint _tmp8_ = 0;
@@ -8407,11 +8408,11 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			_tmp8_ = g_async_queue_length (_tmp7_);
 #line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp3_ = _tmp8_ > 0;
-#line 8404 "scanner.c"
+#line 8405 "scanner.c"
 		}
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp3_) {
-#line 8408 "scanner.c"
+#line 8409 "scanner.c"
 			GAsyncQueue* _tmp9_ = NULL;
 			gpointer _tmp10_ = NULL;
 #line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8422,7 +8423,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			_request_unref0 (request);
 #line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			request = (Request*) _tmp10_;
-#line 8419 "scanner.c"
+#line 8420 "scanner.c"
 		} else {
 #line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = TRUE;
@@ -8430,7 +8431,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			_request_unref0 (request);
 #line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 8427 "scanner.c"
+#line 8428 "scanner.c"
 		}
 #line 802 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:802: Processing request");
@@ -8442,7 +8443,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 		_tmp12_ = request;
 #line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_REQUEST_START_SCAN)) {
-#line 8439 "scanner.c"
+#line 8440 "scanner.c"
 			RequestStartScan* r = NULL;
 			Request* _tmp13_ = NULL;
 			RequestStartScan* _tmp14_ = NULL;
@@ -8465,7 +8466,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			self->priv->job_queue = g_list_append (self->priv->job_queue, _tmp17_);
 #line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (r);
-#line 8462 "scanner.c"
+#line 8463 "scanner.c"
 		} else {
 			Request* _tmp18_ = NULL;
 #line 810 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8474,7 +8475,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_REQUEST_CANCEL)) {
 #line 812 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_fail_scan (self, (gint) SANE_STATUS_CANCELLED, "Scan cancelled - do not report this error");
-#line 8471 "scanner.c"
+#line 8472 "scanner.c"
 			} else {
 				Request* _tmp19_ = NULL;
 #line 814 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8489,13 +8490,13 @@ static gboolean scanner_handle_requests (Scanner* self) {
 					_request_unref0 (request);
 #line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
-#line 8486 "scanner.c"
+#line 8487 "scanner.c"
 				}
 			}
 		}
 #line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_request_unref0 (request);
-#line 8492 "scanner.c"
+#line 8493 "scanner.c"
 	}
 }
 
@@ -8503,7 +8504,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 static void _g_free0_ (gpointer var) {
 #line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	var = (g_free (var), NULL);
-#line 8500 "scanner.c"
+#line 8501 "scanner.c"
 }
 
 
@@ -8561,21 +8562,21 @@ static void scanner_do_open (Scanner* self) {
 	_tmp5_ = _tmp4_->device;
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ == NULL) {
-#line 8558 "scanner.c"
+#line 8559 "scanner.c"
 		const gchar* _tmp6_ = NULL;
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = self->priv->default_device;
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = _tmp6_ != NULL;
-#line 8564 "scanner.c"
+#line 8565 "scanner.c"
 	} else {
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = FALSE;
-#line 8568 "scanner.c"
+#line 8569 "scanner.c"
 	}
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp3_) {
-#line 8572 "scanner.c"
+#line 8573 "scanner.c"
 		ScanJob* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -8589,7 +8590,7 @@ static void scanner_do_open (Scanner* self) {
 		_g_free0 (_tmp7_->device);
 #line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_->device = _tmp9_;
-#line 8586 "scanner.c"
+#line 8587 "scanner.c"
 	}
 #line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = job;
@@ -8597,7 +8598,7 @@ static void scanner_do_open (Scanner* self) {
 	_tmp11_ = _tmp10_->device;
 #line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp11_ == NULL) {
-#line 8594 "scanner.c"
+#line 8595 "scanner.c"
 		const gchar* _tmp12_ = NULL;
 #line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:837: No scan device available");
@@ -8609,13 +8610,13 @@ static void scanner_do_open (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 8606 "scanner.c"
+#line 8607 "scanner.c"
 	}
 #line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp13_ = self->priv->have_handle;
 #line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp13_) {
-#line 8612 "scanner.c"
+#line 8613 "scanner.c"
 		const gchar* _tmp14_ = NULL;
 		ScanJob* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
@@ -8634,7 +8635,7 @@ static void scanner_do_open (Scanner* self) {
 			_scan_job_unref0 (job);
 #line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return;
-#line 8631 "scanner.c"
+#line 8632 "scanner.c"
 		}
 #line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp17_ = self->priv->handle;
@@ -8644,7 +8645,7 @@ static void scanner_do_open (Scanner* self) {
 		g_debug ("scanner.vala:854: sane_close ()");
 #line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->have_handle = FALSE;
-#line 8641 "scanner.c"
+#line 8642 "scanner.c"
 	}
 #line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
@@ -8690,7 +8691,7 @@ static void scanner_do_open (Scanner* self) {
 	_tmp30_ = status;
 #line 865 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp30_ != SANE_STATUS_GOOD) {
-#line 8687 "scanner.c"
+#line 8688 "scanner.c"
 		SANE_Status _tmp31_ = 0;
 		const gchar* _tmp32_ = NULL;
 		SANE_Status _tmp33_ = 0;
@@ -8711,7 +8712,7 @@ static void scanner_do_open (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 871 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 8708 "scanner.c"
+#line 8709 "scanner.c"
 	}
 #line 873 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->have_handle = TRUE;
@@ -8729,7 +8730,7 @@ static void scanner_do_open (Scanner* self) {
 	self->priv->state = SCAN_STATE_GET_OPTION;
 #line 822 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 8726 "scanner.c"
+#line 8727 "scanner.c"
 }
 
 
@@ -8794,7 +8795,7 @@ static void scanner_do_get_option (Scanner* self) {
 	_tmp9_ = option;
 #line 889 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ == NULL) {
-#line 8791 "scanner.c"
+#line 8792 "scanner.c"
 		SANE_Handle _tmp10_ = {0};
 		const gchar* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
@@ -8870,7 +8871,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp14_ = option;
 #line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp14_ == NULL) {
-#line 8867 "scanner.c"
+#line 8868 "scanner.c"
 			SANE_Handle _tmp15_ = {0};
 			gint _tmp16_ = 0;
 			SANE_Option_Descriptor* _tmp17_ = NULL;
@@ -8885,13 +8886,13 @@ static void scanner_do_get_option (Scanner* self) {
 			index = (SANE_Int) _tmp16_;
 #line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp17_;
-#line 8881 "scanner.c"
+#line 8882 "scanner.c"
 		}
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp18_ = option;
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp18_ != NULL) {
-#line 8887 "scanner.c"
+#line 8888 "scanner.c"
 			gchar** flatbed_sources = NULL;
 			gchar* _tmp19_ = NULL;
 			const gchar* _tmp20_ = NULL;
@@ -9103,7 +9104,7 @@ static void scanner_do_get_option (Scanner* self) {
 			switch (_tmp56_) {
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_SINGLE:
-#line 9099 "scanner.c"
+#line 9100 "scanner.c"
 				{
 					SANE_Handle _tmp57_ = {0};
 					SANE_Option_Descriptor* _tmp58_ = NULL;
@@ -9119,7 +9120,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp60_ = scanner_set_default_option (self, _tmp57_, _tmp58_, _tmp59_);
 #line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp60_) {
-#line 9115 "scanner.c"
+#line 9116 "scanner.c"
 						SANE_Handle _tmp61_ = {0};
 						SANE_Option_Descriptor* _tmp62_ = NULL;
 						SANE_Int _tmp63_ = {0};
@@ -9142,16 +9143,16 @@ static void scanner_do_get_option (Scanner* self) {
 						if (!_tmp65_) {
 #line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:949: Unable to set single page source, please file a bug");
-#line 9138 "scanner.c"
+#line 9139 "scanner.c"
 						}
 					}
 #line 950 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9143 "scanner.c"
+#line 9144 "scanner.c"
 				}
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_FRONT:
-#line 9147 "scanner.c"
+#line 9148 "scanner.c"
 				{
 					SANE_Handle _tmp66_ = {0};
 					SANE_Option_Descriptor* _tmp67_ = NULL;
@@ -9173,7 +9174,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp70_ = scanner_set_constrained_string_option (self, _tmp66_, _tmp67_, _tmp68_, _tmp69_, _tmp69__length1, NULL);
 #line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp70_) {
-#line 9169 "scanner.c"
+#line 9170 "scanner.c"
 						SANE_Handle _tmp71_ = {0};
 						SANE_Option_Descriptor* _tmp72_ = NULL;
 						SANE_Int _tmp73_ = {0};
@@ -9196,16 +9197,16 @@ static void scanner_do_get_option (Scanner* self) {
 						if (!_tmp75_) {
 #line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:954: Unable to set front ADF source, please file a bug");
-#line 9192 "scanner.c"
+#line 9193 "scanner.c"
 						}
 					}
 #line 955 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9197 "scanner.c"
+#line 9198 "scanner.c"
 				}
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BACK:
-#line 9201 "scanner.c"
+#line 9202 "scanner.c"
 				{
 					SANE_Handle _tmp76_ = {0};
 					SANE_Option_Descriptor* _tmp77_ = NULL;
@@ -9227,7 +9228,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp80_ = scanner_set_constrained_string_option (self, _tmp76_, _tmp77_, _tmp78_, _tmp79_, _tmp79__length1, NULL);
 #line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp80_) {
-#line 9223 "scanner.c"
+#line 9224 "scanner.c"
 						SANE_Handle _tmp81_ = {0};
 						SANE_Option_Descriptor* _tmp82_ = NULL;
 						SANE_Int _tmp83_ = {0};
@@ -9250,16 +9251,16 @@ static void scanner_do_get_option (Scanner* self) {
 						if (!_tmp85_) {
 #line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:959: Unable to set back ADF source, please file a bug");
-#line 9246 "scanner.c"
+#line 9247 "scanner.c"
 						}
 					}
 #line 960 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9251 "scanner.c"
+#line 9252 "scanner.c"
 				}
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BOTH:
-#line 9255 "scanner.c"
+#line 9256 "scanner.c"
 				{
 					SANE_Handle _tmp86_ = {0};
 					SANE_Option_Descriptor* _tmp87_ = NULL;
@@ -9281,7 +9282,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp90_ = scanner_set_constrained_string_option (self, _tmp86_, _tmp87_, _tmp88_, _tmp89_, _tmp89__length1, NULL);
 #line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp90_) {
-#line 9277 "scanner.c"
+#line 9278 "scanner.c"
 						SANE_Handle _tmp91_ = {0};
 						SANE_Option_Descriptor* _tmp92_ = NULL;
 						SANE_Int _tmp93_ = {0};
@@ -9304,17 +9305,17 @@ static void scanner_do_get_option (Scanner* self) {
 						if (!_tmp95_) {
 #line 964 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:964: Unable to set duplex ADF source, please file a bug");
-#line 9300 "scanner.c"
+#line 9301 "scanner.c"
 						}
 					}
 #line 965 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9305 "scanner.c"
+#line 9306 "scanner.c"
 				}
 				default:
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 9310 "scanner.c"
+#line 9311 "scanner.c"
 			}
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources = (_vala_array_free (adf_duplex_sources, adf_duplex_sources_length1, (GDestroyNotify) g_free), NULL);
@@ -9326,7 +9327,7 @@ static void scanner_do_get_option (Scanner* self) {
 			adf_sources = (_vala_array_free (adf_sources, adf_sources_length1, (GDestroyNotify) g_free), NULL);
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources = (_vala_array_free (flatbed_sources, flatbed_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 9322 "scanner.c"
+#line 9323 "scanner.c"
 		}
 #line 970 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp96_ = self->priv->handle;
@@ -9342,7 +9343,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp100_ = option;
 #line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp100_ != NULL) {
-#line 9338 "scanner.c"
+#line 9339 "scanner.c"
 			gchar** color_scan_modes = NULL;
 			const gchar* _tmp101_ = NULL;
 			gchar* _tmp102_ = NULL;
@@ -9546,7 +9547,7 @@ static void scanner_do_get_option (Scanner* self) {
 			switch (_tmp140_) {
 #line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_COLOR:
-#line 9542 "scanner.c"
+#line 9543 "scanner.c"
 				{
 					SANE_Handle _tmp141_ = {0};
 					SANE_Option_Descriptor* _tmp142_ = NULL;
@@ -9570,15 +9571,15 @@ static void scanner_do_get_option (Scanner* self) {
 					if (!_tmp145_) {
 #line 1014 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						g_warning ("scanner.vala:1014: Unable to set Color mode, please file a bug");
-#line 9566 "scanner.c"
+#line 9567 "scanner.c"
 					}
 #line 1015 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9570 "scanner.c"
+#line 9571 "scanner.c"
 				}
 #line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_GRAY:
-#line 9574 "scanner.c"
+#line 9575 "scanner.c"
 				{
 					SANE_Handle _tmp146_ = {0};
 					SANE_Option_Descriptor* _tmp147_ = NULL;
@@ -9602,15 +9603,15 @@ static void scanner_do_get_option (Scanner* self) {
 					if (!_tmp150_) {
 #line 1018 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						g_warning ("scanner.vala:1018: Unable to set Gray mode, please file a bug");
-#line 9598 "scanner.c"
+#line 9599 "scanner.c"
 					}
 #line 1019 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9602 "scanner.c"
+#line 9603 "scanner.c"
 				}
 #line 1010 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_LINEART:
-#line 9606 "scanner.c"
+#line 9607 "scanner.c"
 				{
 					SANE_Handle _tmp151_ = {0};
 					SANE_Option_Descriptor* _tmp152_ = NULL;
@@ -9634,17 +9635,17 @@ static void scanner_do_get_option (Scanner* self) {
 					if (!_tmp155_) {
 #line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						g_warning ("scanner.vala:1022: Unable to set Lineart mode, please file a bug");
-#line 9630 "scanner.c"
+#line 9631 "scanner.c"
 					}
 #line 1023 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9634 "scanner.c"
+#line 9635 "scanner.c"
 				}
 				default:
 				{
 #line 1025 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9640 "scanner.c"
+#line 9641 "scanner.c"
 				}
 			}
 #line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9653,7 +9654,7 @@ static void scanner_do_get_option (Scanner* self) {
 			gray_scan_modes = (_vala_array_free (gray_scan_modes, gray_scan_modes_length1, (GDestroyNotify) g_free), NULL);
 #line 971 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes = (_vala_array_free (color_scan_modes, color_scan_modes_length1, (GDestroyNotify) g_free), NULL);
-#line 9649 "scanner.c"
+#line 9650 "scanner.c"
 		}
 #line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp156_ = self->priv->handle;
@@ -9667,7 +9668,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp159_ = option;
 #line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp159_ != NULL) {
-#line 9663 "scanner.c"
+#line 9664 "scanner.c"
 			SANE_Option_Descriptor* _tmp160_ = NULL;
 			SANE_Value_Type _tmp161_ = 0;
 #line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9676,7 +9677,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp161_ = _tmp160_->type;
 #line 1033 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp161_ == SANE_TYPE_BOOL) {
-#line 9672 "scanner.c"
+#line 9673 "scanner.c"
 				SANE_Handle _tmp162_ = {0};
 				SANE_Option_Descriptor* _tmp163_ = NULL;
 				SANE_Int _tmp164_ = {0};
@@ -9694,7 +9695,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp166_ = _tmp165_->type;
 #line 1034 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp162_, _tmp163_, _tmp164_, _tmp166_ == SCAN_TYPE_ADF_BOTH, NULL);
-#line 9690 "scanner.c"
+#line 9691 "scanner.c"
 			}
 		}
 #line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9709,7 +9710,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp170_ = option;
 #line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp170_ != NULL) {
-#line 9705 "scanner.c"
+#line 9706 "scanner.c"
 			SANE_Option_Descriptor* _tmp171_ = NULL;
 			SANE_Value_Type _tmp172_ = 0;
 #line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9718,7 +9719,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp172_ = _tmp171_->type;
 #line 1041 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp172_ == SANE_TYPE_BOOL) {
-#line 9714 "scanner.c"
+#line 9715 "scanner.c"
 				SANE_Handle _tmp173_ = {0};
 				SANE_Option_Descriptor* _tmp174_ = NULL;
 				SANE_Int _tmp175_ = {0};
@@ -9736,7 +9737,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp177_ = _tmp176_->type;
 #line 1042 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp173_, _tmp174_, _tmp175_, _tmp177_ != SCAN_TYPE_SINGLE, NULL);
-#line 9732 "scanner.c"
+#line 9733 "scanner.c"
 			}
 		}
 #line 1046 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9751,7 +9752,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp181_ = option;
 #line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp181_ != NULL) {
-#line 9747 "scanner.c"
+#line 9748 "scanner.c"
 			gchar** disable_compression_names = NULL;
 			const gchar* _tmp182_ = NULL;
 			gchar* _tmp183_ = NULL;
@@ -9812,11 +9813,11 @@ static void scanner_do_get_option (Scanner* self) {
 			if (!_tmp193_) {
 #line 1058 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				g_warning ("scanner.vala:1058: Unable to disable compression, please file a bug");
-#line 9808 "scanner.c"
+#line 9809 "scanner.c"
 			}
 #line 1047 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names = (_vala_array_free (disable_compression_names, disable_compression_names_length1, (GDestroyNotify) g_free), NULL);
-#line 9812 "scanner.c"
+#line 9813 "scanner.c"
 		}
 #line 1062 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp194_ = self->priv->handle;
@@ -9832,7 +9833,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp198_ = option;
 #line 1063 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp198_ != NULL) {
-#line 9828 "scanner.c"
+#line 9829 "scanner.c"
 			SANE_Handle _tmp199_ = {0};
 			SANE_Option_Descriptor* _tmp200_ = NULL;
 			SANE_Int _tmp201_ = {0};
@@ -9875,7 +9876,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp210_ = option;
 #line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp210_ != NULL) {
-#line 9871 "scanner.c"
+#line 9872 "scanner.c"
 				ScanJob* _tmp211_ = NULL;
 				gint _tmp212_ = 0;
 #line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9884,7 +9885,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp212_ = _tmp211_->depth;
 #line 1069 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp212_ > 0) {
-#line 9880 "scanner.c"
+#line 9881 "scanner.c"
 					SANE_Handle _tmp213_ = {0};
 					SANE_Option_Descriptor* _tmp214_ = NULL;
 					SANE_Int _tmp215_ = {0};
@@ -9902,7 +9903,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp217_ = _tmp216_->depth;
 #line 1070 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_set_int_option (self, _tmp213_, _tmp214_, _tmp215_, _tmp217_, NULL);
-#line 9898 "scanner.c"
+#line 9899 "scanner.c"
 				}
 			}
 		}
@@ -9920,7 +9921,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp222_ = option;
 #line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp222_ != NULL) {
-#line 9916 "scanner.c"
+#line 9917 "scanner.c"
 			ScanJob* _tmp223_ = NULL;
 			gint _tmp224_ = 0;
 #line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9929,7 +9930,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp224_ = _tmp223_->page_width;
 #line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp224_ > 0) {
-#line 9925 "scanner.c"
+#line 9926 "scanner.c"
 				SANE_Handle _tmp225_ = {0};
 				SANE_Option_Descriptor* _tmp226_ = NULL;
 				SANE_Int _tmp227_ = {0};
@@ -9959,7 +9960,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp233_ = scanner_convert_page_size (self, _tmp228_, (gdouble) _tmp230_, _tmp232_);
 #line 1079 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_fixed_or_int_option (self, _tmp225_, _tmp226_, _tmp227_, _tmp233_, NULL);
-#line 9955 "scanner.c"
+#line 9956 "scanner.c"
 			} else {
 				SANE_Handle _tmp234_ = {0};
 				SANE_Option_Descriptor* _tmp235_ = NULL;
@@ -9972,7 +9973,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp236_ = index;
 #line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_option_to_max (self, _tmp234_, _tmp235_, _tmp236_);
-#line 9968 "scanner.c"
+#line 9969 "scanner.c"
 			}
 		}
 #line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9989,7 +9990,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp241_ = option;
 #line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp241_ != NULL) {
-#line 9985 "scanner.c"
+#line 9986 "scanner.c"
 			ScanJob* _tmp242_ = NULL;
 			gint _tmp243_ = 0;
 #line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9998,7 +9999,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp243_ = _tmp242_->page_height;
 #line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp243_ > 0) {
-#line 9994 "scanner.c"
+#line 9995 "scanner.c"
 				SANE_Handle _tmp244_ = {0};
 				SANE_Option_Descriptor* _tmp245_ = NULL;
 				SANE_Int _tmp246_ = {0};
@@ -10028,7 +10029,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp252_ = scanner_convert_page_size (self, _tmp247_, (gdouble) _tmp249_, _tmp251_);
 #line 1087 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_fixed_or_int_option (self, _tmp244_, _tmp245_, _tmp246_, _tmp252_, NULL);
-#line 10024 "scanner.c"
+#line 10025 "scanner.c"
 			} else {
 				SANE_Handle _tmp253_ = {0};
 				SANE_Option_Descriptor* _tmp254_ = NULL;
@@ -10041,7 +10042,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp255_ = index;
 #line 1089 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_option_to_max (self, _tmp253_, _tmp254_, _tmp255_);
-#line 10037 "scanner.c"
+#line 10038 "scanner.c"
 			}
 		}
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10058,7 +10059,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp261_ = option;
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp261_ != NULL) {
-#line 10054 "scanner.c"
+#line 10055 "scanner.c"
 			ScanJob* _tmp262_ = NULL;
 			gint _tmp263_ = 0;
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10067,15 +10068,15 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp263_ = _tmp262_->page_width;
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp260_ = ((gdouble) _tmp263_) > 0.0;
-#line 10063 "scanner.c"
+#line 10064 "scanner.c"
 		} else {
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp260_ = FALSE;
-#line 10067 "scanner.c"
+#line 10068 "scanner.c"
 		}
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp260_) {
-#line 10071 "scanner.c"
+#line 10072 "scanner.c"
 			SANE_Handle _tmp264_ = {0};
 			SANE_Option_Descriptor* _tmp265_ = NULL;
 			SANE_Int _tmp266_ = {0};
@@ -10105,7 +10106,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp272_ = scanner_convert_page_size (self, _tmp267_, (gdouble) _tmp269_, _tmp271_);
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_set_fixed_or_int_option (self, _tmp264_, _tmp265_, _tmp266_, _tmp272_, NULL);
-#line 10101 "scanner.c"
+#line 10102 "scanner.c"
 		}
 #line 1096 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp273_ = self->priv->handle;
@@ -10121,7 +10122,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp278_ = option;
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp278_ != NULL) {
-#line 10117 "scanner.c"
+#line 10118 "scanner.c"
 			ScanJob* _tmp279_ = NULL;
 			gint _tmp280_ = 0;
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10130,15 +10131,15 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp280_ = _tmp279_->page_height;
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp277_ = ((gdouble) _tmp280_) > 0.0;
-#line 10126 "scanner.c"
+#line 10127 "scanner.c"
 		} else {
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp277_ = FALSE;
-#line 10130 "scanner.c"
+#line 10131 "scanner.c"
 		}
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp277_) {
-#line 10134 "scanner.c"
+#line 10135 "scanner.c"
 			SANE_Handle _tmp281_ = {0};
 			SANE_Option_Descriptor* _tmp282_ = NULL;
 			SANE_Int _tmp283_ = {0};
@@ -10168,7 +10169,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp289_ = scanner_convert_page_size (self, _tmp284_, (gdouble) _tmp286_, _tmp288_);
 #line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_set_fixed_or_int_option (self, _tmp281_, _tmp282_, _tmp283_, _tmp289_, NULL);
-#line 10164 "scanner.c"
+#line 10165 "scanner.c"
 		}
 #line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp290_ = self->priv->handle;
@@ -10184,7 +10185,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp294_ = option;
 #line 1101 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp294_ != NULL) {
-#line 10180 "scanner.c"
+#line 10181 "scanner.c"
 			ScanJob* _tmp295_ = NULL;
 			gint _tmp296_ = 0;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10193,7 +10194,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp296_ = _tmp295_->brightness;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp296_ != 0) {
-#line 10189 "scanner.c"
+#line 10190 "scanner.c"
 				gint brightness = 0;
 				SANE_Option_Descriptor* _tmp297_ = NULL;
 				ScanJob* _tmp298_ = NULL;
@@ -10223,7 +10224,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp304_ = brightness;
 #line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp301_, _tmp302_, _tmp303_, _tmp304_, NULL);
-#line 10219 "scanner.c"
+#line 10220 "scanner.c"
 			}
 		}
 #line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10240,7 +10241,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp309_ = option;
 #line 1110 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp309_ != NULL) {
-#line 10236 "scanner.c"
+#line 10237 "scanner.c"
 			ScanJob* _tmp310_ = NULL;
 			gint _tmp311_ = 0;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10249,7 +10250,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp311_ = _tmp310_->contrast;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp311_ != 0) {
-#line 10245 "scanner.c"
+#line 10246 "scanner.c"
 				gint contrast = 0;
 				SANE_Option_Descriptor* _tmp312_ = NULL;
 				ScanJob* _tmp313_ = NULL;
@@ -10279,14 +10280,14 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp319_ = contrast;
 #line 1115 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp316_, _tmp317_, _tmp318_, _tmp319_, NULL);
-#line 10275 "scanner.c"
+#line 10276 "scanner.c"
 			}
 		}
 #line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp320_ = self->priv->current_device;
 #line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (g_strcmp0 (_tmp320_, "test") == 0) {
-#line 10282 "scanner.c"
+#line 10283 "scanner.c"
 			SANE_Handle _tmp321_ = {0};
 			gint _tmp322_ = 0;
 			SANE_Option_Descriptor* _tmp323_ = NULL;
@@ -10319,7 +10320,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp324_ = option;
 #line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp324_ != NULL) {
-#line 10315 "scanner.c"
+#line 10316 "scanner.c"
 				SANE_Handle _tmp325_ = {0};
 				SANE_Option_Descriptor* _tmp326_ = NULL;
 				SANE_Int _tmp327_ = {0};
@@ -10331,7 +10332,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp327_ = index;
 #line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp325_, _tmp326_, _tmp327_, FALSE, NULL);
-#line 10327 "scanner.c"
+#line 10328 "scanner.c"
 			}
 #line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp328_ = self->priv->handle;
@@ -10345,7 +10346,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp331_ = option;
 #line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp331_ != NULL) {
-#line 10341 "scanner.c"
+#line 10342 "scanner.c"
 				SANE_Handle _tmp332_ = {0};
 				SANE_Option_Descriptor* _tmp333_ = NULL;
 				SANE_Int _tmp334_ = {0};
@@ -10357,7 +10358,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp334_ = index;
 #line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp332_, _tmp333_, _tmp334_, FALSE, NULL);
-#line 10353 "scanner.c"
+#line 10354 "scanner.c"
 			}
 #line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp335_ = self->priv->handle;
@@ -10371,7 +10372,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp338_ = option;
 #line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp338_ != NULL) {
-#line 10367 "scanner.c"
+#line 10368 "scanner.c"
 				SANE_Handle _tmp339_ = {0};
 				SANE_Option_Descriptor* _tmp340_ = NULL;
 				SANE_Int _tmp341_ = {0};
@@ -10383,7 +10384,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp341_ = index;
 #line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_string_option (self, _tmp339_, _tmp340_, _tmp341_, "Color pattern", NULL);
-#line 10379 "scanner.c"
+#line 10380 "scanner.c"
 			}
 #line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp342_ = self->priv->handle;
@@ -10397,7 +10398,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp345_ = option;
 #line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp345_ != NULL) {
-#line 10393 "scanner.c"
+#line 10394 "scanner.c"
 				SANE_Handle _tmp346_ = {0};
 				SANE_Option_Descriptor* _tmp347_ = NULL;
 				SANE_Int _tmp348_ = {0};
@@ -10409,7 +10410,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp348_ = index;
 #line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp346_, _tmp347_, _tmp348_, TRUE, NULL);
-#line 10405 "scanner.c"
+#line 10406 "scanner.c"
 			}
 #line 1134 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp349_ = self->priv->handle;
@@ -10423,7 +10424,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp352_ = option;
 #line 1135 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp352_ != NULL) {
-#line 10419 "scanner.c"
+#line 10420 "scanner.c"
 				SANE_Handle _tmp353_ = {0};
 				SANE_Option_Descriptor* _tmp354_ = NULL;
 				SANE_Int _tmp355_ = {0};
@@ -10435,7 +10436,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp355_ = index;
 #line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_int_option (self, _tmp353_, _tmp354_, _tmp355_, 200000, NULL);
-#line 10431 "scanner.c"
+#line 10432 "scanner.c"
 			}
 		}
 #line 1139 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10444,7 +10445,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10440 "scanner.c"
+#line 10441 "scanner.c"
 	}
 #line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp356_ = index;
@@ -10462,7 +10463,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10458 "scanner.c"
+#line 10459 "scanner.c"
 	}
 #line 1150 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp360_ = option;
@@ -10474,7 +10475,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10470 "scanner.c"
+#line 10471 "scanner.c"
 	}
 #line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp362_ = option;
@@ -10486,7 +10487,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1155 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10482 "scanner.c"
+#line 10483 "scanner.c"
 	}
 #line 1157 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp364_ = self->priv->options;
@@ -10502,7 +10503,7 @@ static void scanner_do_get_option (Scanner* self) {
 	g_hash_table_insert (_tmp364_, _tmp367_, (gpointer) ((gintptr) ((gint) _tmp368_)));
 #line 879 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 10498 "scanner.c"
+#line 10499 "scanner.c"
 }
 
 
@@ -10520,7 +10521,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 	_tmp1_ = _tmp0_->unit;
 #line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SANE_UNIT_PIXEL) {
-#line 10516 "scanner.c"
+#line 10517 "scanner.c"
 		gdouble _tmp2_ = 0.0;
 		gdouble _tmp3_ = 0.0;
 #line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10531,7 +10532,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 		result = (_tmp2_ * _tmp3_) / 254.0;
 #line 1163 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 10527 "scanner.c"
+#line 10528 "scanner.c"
 	} else {
 		SANE_Option_Descriptor* _tmp4_ = NULL;
 		SANE_Unit _tmp5_ = 0;
@@ -10541,7 +10542,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 		_tmp5_ = _tmp4_->unit;
 #line 1164 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp5_ == SANE_UNIT_MM) {
-#line 10537 "scanner.c"
+#line 10538 "scanner.c"
 			gdouble _tmp6_ = 0.0;
 #line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = size;
@@ -10549,7 +10550,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 			result = _tmp6_ / 10.0;
 #line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 10545 "scanner.c"
+#line 10546 "scanner.c"
 		} else {
 #line 1168 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:1168: Unable to set unsupported unit type");
@@ -10557,7 +10558,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 			result = (gdouble) 0.0f;
 #line 1169 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 10553 "scanner.c"
+#line 10554 "scanner.c"
 		}
 	}
 }
@@ -10595,11 +10596,11 @@ static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_H
 		if (index) {
 #line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			*index = _vala_index;
-#line 10591 "scanner.c"
+#line 10592 "scanner.c"
 		}
 #line 1177 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 10595 "scanner.c"
+#line 10596 "scanner.c"
 	}
 #line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = handle;
@@ -10613,11 +10614,11 @@ static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_H
 	if (index) {
 #line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*index = _vala_index;
-#line 10609 "scanner.c"
+#line 10610 "scanner.c"
 	}
 #line 1179 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 10613 "scanner.c"
+#line 10614 "scanner.c"
 }
 
 
@@ -10649,7 +10650,7 @@ static void scanner_do_complete_document (Scanner* self) {
 		self->priv->state = SCAN_STATE_OPEN;
 #line 1195 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10645 "scanner.c"
+#line 10646 "scanner.c"
 	}
 #line 1201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = notify_document_done_new ();
@@ -10661,7 +10662,7 @@ static void scanner_do_complete_document (Scanner* self) {
 	_notify_unref0 (_tmp4_);
 #line 1202 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
-#line 10657 "scanner.c"
+#line 10658 "scanner.c"
 }
 
 
@@ -10713,7 +10714,7 @@ static void scanner_do_start (Scanner* self) {
 	if (_tmp9_ == SANE_STATUS_GOOD) {
 #line 1214 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_GET_PARAMETERS;
-#line 10709 "scanner.c"
+#line 10710 "scanner.c"
 	} else {
 		SANE_Status _tmp10_ = 0;
 #line 1215 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10722,7 +10723,7 @@ static void scanner_do_start (Scanner* self) {
 		if (_tmp10_ == SANE_STATUS_NO_DOCS) {
 #line 1216 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_do_complete_document (self);
-#line 10718 "scanner.c"
+#line 10719 "scanner.c"
 		} else {
 			SANE_Status _tmp11_ = 0;
 			const gchar* _tmp12_ = NULL;
@@ -10740,7 +10741,7 @@ static void scanner_do_start (Scanner* self) {
 			_tmp14_ = _ ("Unable to start scan");
 #line 1220 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_fail_scan (self, (gint) _tmp13_, _tmp14_);
-#line 10736 "scanner.c"
+#line 10737 "scanner.c"
 		}
 	}
 }
@@ -10755,7 +10756,7 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 	switch (_tmp0_) {
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GRAY:
-#line 10751 "scanner.c"
+#line 10752 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10764,11 +10765,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp1_;
 #line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10760 "scanner.c"
+#line 10761 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RGB:
-#line 10764 "scanner.c"
+#line 10765 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10777,11 +10778,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp2_;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10773 "scanner.c"
+#line 10774 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RED:
-#line 10777 "scanner.c"
+#line 10778 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10790,11 +10791,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp3_;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10786 "scanner.c"
+#line 10787 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GREEN:
-#line 10790 "scanner.c"
+#line 10791 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10803,11 +10804,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp4_;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10799 "scanner.c"
+#line 10800 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_BLUE:
-#line 10803 "scanner.c"
+#line 10804 "scanner.c"
 		{
 			gchar* _tmp5_ = NULL;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10816,7 +10817,7 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp5_;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10812 "scanner.c"
+#line 10813 "scanner.c"
 		}
 		default:
 		{
@@ -10830,7 +10831,7 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp7_;
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10826 "scanner.c"
+#line 10827 "scanner.c"
 		}
 	}
 }
@@ -10921,7 +10922,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 	_tmp6_ = status;
 #line 1230 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != SANE_STATUS_GOOD) {
-#line 10917 "scanner.c"
+#line 10918 "scanner.c"
 		SANE_Status _tmp7_ = 0;
 		const gchar* _tmp8_ = NULL;
 		SANE_Status _tmp9_ = 0;
@@ -10940,7 +10941,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 		scanner_fail_scan (self, (gint) _tmp9_, _tmp10_);
 #line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10936 "scanner.c"
+#line 10937 "scanner.c"
 	}
 #line 1239 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = self->priv->job_queue;
@@ -10958,11 +10959,11 @@ static void scanner_do_get_parameters (Scanner* self) {
 	if (_tmp16_) {
 #line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_TRUE";
-#line 10954 "scanner.c"
+#line 10955 "scanner.c"
 	} else {
 #line 1243 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_FALSE";
-#line 10958 "scanner.c"
+#line 10959 "scanner.c"
 	}
 #line 1241 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = self->priv->parameters;
@@ -11027,7 +11028,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 	_tmp43_ = _tmp42_.depth;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp43_ == 8) {
-#line 11022 "scanner.c"
+#line 11023 "scanner.c"
 		SANE_Parameters _tmp44_ = {0};
 		SANE_Frame _tmp45_ = 0;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11036,15 +11037,15 @@ static void scanner_do_get_parameters (Scanner* self) {
 		_tmp45_ = _tmp44_.format;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = _tmp45_ == SANE_FRAME_GRAY;
-#line 11031 "scanner.c"
+#line 11032 "scanner.c"
 	} else {
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp41_ = FALSE;
-#line 11035 "scanner.c"
+#line 11036 "scanner.c"
 	}
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp41_) {
-#line 11039 "scanner.c"
+#line 11040 "scanner.c"
 		ScanJob* _tmp46_ = NULL;
 		gint _tmp47_ = 0;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11053,15 +11054,15 @@ static void scanner_do_get_parameters (Scanner* self) {
 		_tmp47_ = _tmp46_->depth;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = _tmp47_ == 2;
-#line 11048 "scanner.c"
+#line 11049 "scanner.c"
 	} else {
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp40_ = FALSE;
-#line 11052 "scanner.c"
+#line 11053 "scanner.c"
 	}
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp40_) {
-#line 11056 "scanner.c"
+#line 11057 "scanner.c"
 		ScanJob* _tmp48_ = NULL;
 		ScanMode _tmp49_ = 0;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11070,15 +11071,15 @@ static void scanner_do_get_parameters (Scanner* self) {
 		_tmp49_ = _tmp48_->scan_mode;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp39_ = _tmp49_ == SCAN_MODE_GRAY;
-#line 11065 "scanner.c"
+#line 11066 "scanner.c"
 	} else {
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp39_ = FALSE;
-#line 11069 "scanner.c"
+#line 11070 "scanner.c"
 	}
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp39_) {
-#line 11073 "scanner.c"
+#line 11074 "scanner.c"
 		ScanPageInfo* _tmp50_ = NULL;
 		ScanJob* _tmp51_ = NULL;
 		gint _tmp52_ = 0;
@@ -11090,7 +11091,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 		_tmp52_ = _tmp51_->depth;
 #line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp50_->depth = _tmp52_;
-#line 11085 "scanner.c"
+#line 11086 "scanner.c"
 	}
 #line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp54_ = self->priv->parameters;
@@ -11100,11 +11101,11 @@ static void scanner_do_get_parameters (Scanner* self) {
 	if (_tmp55_ == SANE_FRAME_GRAY) {
 #line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = 1;
-#line 11095 "scanner.c"
+#line 11096 "scanner.c"
 	} else {
 #line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp53_ = 3;
-#line 11099 "scanner.c"
+#line 11100 "scanner.c"
 	}
 #line 1257 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp56_ = info;
@@ -11134,7 +11135,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 	_tmp64_ = self->priv->notified_page;
 #line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp63_ != _tmp64_) {
-#line 11129 "scanner.c"
+#line 11130 "scanner.c"
 		ScanJob* _tmp65_ = NULL;
 		gint _tmp66_ = 0;
 		ScanPageInfo* _tmp67_ = NULL;
@@ -11159,7 +11160,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 		_tmp70_ = self->priv->page_number;
 #line 1264 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->notified_page = _tmp70_;
-#line 11154 "scanner.c"
+#line 11155 "scanner.c"
 	}
 #line 1268 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp71_ = self->priv->parameters;
@@ -11191,7 +11192,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 	_scan_page_info_unref0 (info);
 #line 1226 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 11186 "scanner.c"
+#line 11187 "scanner.c"
 }
 
 
@@ -11236,7 +11237,7 @@ static void scanner_do_complete_page (Scanner* self) {
 	_tmp8_ = _tmp7_.last_frame;
 #line 1283 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!_tmp8_) {
-#line 11231 "scanner.c"
+#line 11232 "scanner.c"
 		gint _tmp9_ = 0;
 #line 1285 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->pass_number;
@@ -11248,7 +11249,7 @@ static void scanner_do_complete_page (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1287 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11243 "scanner.c"
+#line 11244 "scanner.c"
 	}
 #line 1291 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = job;
@@ -11256,7 +11257,7 @@ static void scanner_do_complete_page (Scanner* self) {
 	_tmp11_ = _tmp10_->type;
 #line 1291 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp11_ != SCAN_TYPE_SINGLE) {
-#line 11251 "scanner.c"
+#line 11252 "scanner.c"
 		gint _tmp12_ = 0;
 		ScanJob* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
@@ -11286,13 +11287,13 @@ static void scanner_do_complete_page (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11281 "scanner.c"
+#line 11282 "scanner.c"
 	}
 #line 1300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_do_complete_document (self);
 #line 1276 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 11287 "scanner.c"
+#line 11288 "scanner.c"
 }
 
 
@@ -11387,7 +11388,7 @@ static void scanner_do_read (Scanner* self) {
 	_tmp17_ = status;
 #line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp17_ == SANE_STATUS_EOF) {
-#line 11382 "scanner.c"
+#line 11383 "scanner.c"
 		gboolean _tmp18_ = FALSE;
 		SANE_Parameters _tmp19_ = {0};
 		gint _tmp20_ = 0;
@@ -11398,7 +11399,7 @@ static void scanner_do_read (Scanner* self) {
 		_tmp20_ = _tmp19_.lines;
 #line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ > 0) {
-#line 11393 "scanner.c"
+#line 11394 "scanner.c"
 			gint _tmp21_ = 0;
 			SANE_Parameters _tmp22_ = {0};
 			gint _tmp23_ = 0;
@@ -11410,15 +11411,15 @@ static void scanner_do_read (Scanner* self) {
 			_tmp23_ = _tmp22_.lines;
 #line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = _tmp21_ != _tmp23_;
-#line 11405 "scanner.c"
+#line 11406 "scanner.c"
 		} else {
 #line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = FALSE;
-#line 11409 "scanner.c"
+#line 11410 "scanner.c"
 		}
 #line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp18_) {
-#line 11413 "scanner.c"
+#line 11414 "scanner.c"
 			gint _tmp24_ = 0;
 			SANE_Parameters _tmp25_ = {0};
 			gint _tmp26_ = 0;
@@ -11430,19 +11431,19 @@ static void scanner_do_read (Scanner* self) {
 			_tmp26_ = _tmp25_.lines;
 #line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:1319: Scan completed with %d lines, expected %d lines", _tmp24_, _tmp26_);
-#line 11425 "scanner.c"
+#line 11426 "scanner.c"
 		}
 #line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp27_ = self->priv->n_used;
 #line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp27_ > 0) {
-#line 11431 "scanner.c"
+#line 11432 "scanner.c"
 			gint _tmp28_ = 0;
 #line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = self->priv->n_used;
 #line 1321 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:1321: Scan complete with %d bytes of unused data", _tmp28_);
-#line 11437 "scanner.c"
+#line 11438 "scanner.c"
 		}
 #line 1322 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_do_complete_page (self);
@@ -11450,13 +11451,13 @@ static void scanner_do_read (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1323 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11445 "scanner.c"
+#line 11446 "scanner.c"
 	}
 #line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp29_ = status;
 #line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp29_ != SANE_STATUS_GOOD) {
-#line 11451 "scanner.c"
+#line 11452 "scanner.c"
 		SANE_Status _tmp30_ = 0;
 		const gchar* _tmp31_ = NULL;
 		SANE_Status _tmp32_ = 0;
@@ -11477,7 +11478,7 @@ static void scanner_do_read (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11472 "scanner.c"
+#line 11473 "scanner.c"
 	}
 #line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	full_read = FALSE;
@@ -11485,7 +11486,7 @@ static void scanner_do_read (Scanner* self) {
 	_tmp35_ = self->priv->n_used;
 #line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp35_ == 0) {
-#line 11480 "scanner.c"
+#line 11481 "scanner.c"
 		SANE_Int _tmp36_ = {0};
 		guchar* _tmp37_ = NULL;
 		gint _tmp37__length1 = 0;
@@ -11497,17 +11498,17 @@ static void scanner_do_read (Scanner* self) {
 		_tmp37__length1 = self->priv->buffer_length1;
 #line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = _tmp36_ == ((SANE_Int) _tmp37__length1);
-#line 11492 "scanner.c"
+#line 11493 "scanner.c"
 	} else {
 #line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp34_ = FALSE;
-#line 11496 "scanner.c"
+#line 11497 "scanner.c"
 	}
 #line 1337 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp34_) {
 #line 1338 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		full_read = TRUE;
-#line 11502 "scanner.c"
+#line 11503 "scanner.c"
 	}
 #line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp38_ = self->priv->n_used;
@@ -11523,7 +11524,7 @@ static void scanner_do_read (Scanner* self) {
 	_tmp42_ = _tmp41_.bytes_per_line;
 #line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp40_ >= _tmp42_) {
-#line 11518 "scanner.c"
+#line 11519 "scanner.c"
 		ScanLine* line = NULL;
 		ScanLine* _tmp43_ = NULL;
 		SANE_Parameters _tmp44_ = {0};
@@ -11584,7 +11585,7 @@ static void scanner_do_read (Scanner* self) {
 		switch (_tmp45_) {
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GRAY:
-#line 11579 "scanner.c"
+#line 11580 "scanner.c"
 			{
 				ScanLine* _tmp46_ = NULL;
 #line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11593,11 +11594,11 @@ static void scanner_do_read (Scanner* self) {
 				_tmp46_->channel = 0;
 #line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11588 "scanner.c"
+#line 11589 "scanner.c"
 			}
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RGB:
-#line 11592 "scanner.c"
+#line 11593 "scanner.c"
 			{
 				ScanLine* _tmp47_ = NULL;
 #line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11606,11 +11607,11 @@ static void scanner_do_read (Scanner* self) {
 				_tmp47_->channel = -1;
 #line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11601 "scanner.c"
+#line 11602 "scanner.c"
 			}
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RED:
-#line 11605 "scanner.c"
+#line 11606 "scanner.c"
 			{
 				ScanLine* _tmp48_ = NULL;
 #line 1354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11619,11 +11620,11 @@ static void scanner_do_read (Scanner* self) {
 				_tmp48_->channel = 0;
 #line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11614 "scanner.c"
+#line 11615 "scanner.c"
 			}
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GREEN:
-#line 11618 "scanner.c"
+#line 11619 "scanner.c"
 			{
 				ScanLine* _tmp49_ = NULL;
 #line 1357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11632,11 +11633,11 @@ static void scanner_do_read (Scanner* self) {
 				_tmp49_->channel = 1;
 #line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11627 "scanner.c"
+#line 11628 "scanner.c"
 			}
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_BLUE:
-#line 11631 "scanner.c"
+#line 11632 "scanner.c"
 			{
 				ScanLine* _tmp50_ = NULL;
 #line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11645,12 +11646,12 @@ static void scanner_do_read (Scanner* self) {
 				_tmp50_->channel = 2;
 #line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11640 "scanner.c"
+#line 11641 "scanner.c"
 			}
 			default:
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 11645 "scanner.c"
+#line 11646 "scanner.c"
 		}
 #line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp51_ = line;
@@ -11728,7 +11729,7 @@ static void scanner_do_read (Scanner* self) {
 		_tmp73_ = full_read;
 #line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp73_) {
-#line 11723 "scanner.c"
+#line 11724 "scanner.c"
 			gint _tmp74_ = 0;
 			SANE_Parameters _tmp75_ = {0};
 			gint _tmp76_ = 0;
@@ -11740,7 +11741,7 @@ static void scanner_do_read (Scanner* self) {
 			_tmp76_ = _tmp75_.bytes_per_line;
 #line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			buffer_size = _tmp74_ + _tmp76_;
-#line 11735 "scanner.c"
+#line 11736 "scanner.c"
 		}
 #line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp77_ = buffer_size;
@@ -11768,19 +11769,19 @@ static void scanner_do_read (Scanner* self) {
 		n_remaining = _tmp79_ - (_tmp81_ * _tmp83_);
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->n_used = 0;
-#line 11763 "scanner.c"
+#line 11764 "scanner.c"
 		{
 			gint i = 0;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			i = 0;
-#line 11768 "scanner.c"
+#line 11769 "scanner.c"
 			{
 				gboolean _tmp84_ = FALSE;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp84_ = TRUE;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				while (TRUE) {
-#line 11775 "scanner.c"
+#line 11776 "scanner.c"
 					gint _tmp86_ = 0;
 					gint _tmp87_ = 0;
 					guchar* _tmp88_ = NULL;
@@ -11799,13 +11800,13 @@ static void scanner_do_read (Scanner* self) {
 					gint _tmp99_ = 0;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp84_) {
-#line 11794 "scanner.c"
+#line 11795 "scanner.c"
 						gint _tmp85_ = 0;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp85_ = i;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						i = _tmp85_ + 1;
-#line 11800 "scanner.c"
+#line 11801 "scanner.c"
 					}
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp84_ = FALSE;
@@ -11817,7 +11818,7 @@ static void scanner_do_read (Scanner* self) {
 					if (!(_tmp86_ < _tmp87_)) {
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						break;
-#line 11812 "scanner.c"
+#line 11813 "scanner.c"
 					}
 #line 1382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp88_ = self->priv->buffer;
@@ -11851,7 +11852,7 @@ static void scanner_do_read (Scanner* self) {
 					_tmp99_ = self->priv->n_used;
 #line 1383 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->n_used = _tmp99_ + 1;
-#line 11846 "scanner.c"
+#line 11847 "scanner.c"
 				}
 			}
 		}
@@ -11861,7 +11862,7 @@ static void scanner_do_read (Scanner* self) {
 		_tmp104_ = _tmp103_.depth;
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp104_ == 8) {
-#line 11856 "scanner.c"
+#line 11857 "scanner.c"
 			SANE_Parameters _tmp105_ = {0};
 			SANE_Frame _tmp106_ = 0;
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11870,15 +11871,15 @@ static void scanner_do_read (Scanner* self) {
 			_tmp106_ = _tmp105_.format;
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = _tmp106_ == SANE_FRAME_GRAY;
-#line 11865 "scanner.c"
+#line 11866 "scanner.c"
 		} else {
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp102_ = FALSE;
-#line 11869 "scanner.c"
+#line 11870 "scanner.c"
 		}
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp102_) {
-#line 11873 "scanner.c"
+#line 11874 "scanner.c"
 			ScanJob* _tmp107_ = NULL;
 			gint _tmp108_ = 0;
 #line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11887,15 +11888,15 @@ static void scanner_do_read (Scanner* self) {
 			_tmp108_ = _tmp107_->depth;
 #line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp101_ = _tmp108_ == 2;
-#line 11882 "scanner.c"
+#line 11883 "scanner.c"
 		} else {
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp101_ = FALSE;
-#line 11886 "scanner.c"
+#line 11887 "scanner.c"
 		}
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp101_) {
-#line 11890 "scanner.c"
+#line 11891 "scanner.c"
 			ScanJob* _tmp109_ = NULL;
 			ScanMode _tmp110_ = 0;
 #line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11904,15 +11905,15 @@ static void scanner_do_read (Scanner* self) {
 			_tmp110_ = _tmp109_->scan_mode;
 #line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp100_ = _tmp110_ == SCAN_MODE_GRAY;
-#line 11899 "scanner.c"
+#line 11900 "scanner.c"
 		} else {
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp100_ = FALSE;
-#line 11903 "scanner.c"
+#line 11904 "scanner.c"
 		}
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp100_) {
-#line 11907 "scanner.c"
+#line 11908 "scanner.c"
 			guchar block = '\0';
 			gint write_offset = 0;
 			gint block_shift = 0;
@@ -11925,19 +11926,19 @@ static void scanner_do_read (Scanner* self) {
 			write_offset = 0;
 #line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			block_shift = 6;
-#line 11920 "scanner.c"
+#line 11921 "scanner.c"
 			{
 				gint i = 0;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 11925 "scanner.c"
+#line 11926 "scanner.c"
 				{
 					gboolean _tmp111_ = FALSE;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp111_ = TRUE;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 11932 "scanner.c"
+#line 11933 "scanner.c"
 						gint _tmp113_ = 0;
 						ScanLine* _tmp114_ = NULL;
 						gint _tmp115_ = 0;
@@ -11948,13 +11949,13 @@ static void scanner_do_read (Scanner* self) {
 						gint _tmp143_ = 0;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (!_tmp111_) {
-#line 11943 "scanner.c"
+#line 11944 "scanner.c"
 							gint _tmp112_ = 0;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_tmp112_ = i;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							i = _tmp112_ + 1;
-#line 11949 "scanner.c"
+#line 11950 "scanner.c"
 						}
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp111_ = FALSE;
@@ -11968,7 +11969,7 @@ static void scanner_do_read (Scanner* self) {
 						if (!(_tmp113_ < _tmp115_)) {
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 11963 "scanner.c"
+#line 11964 "scanner.c"
 						}
 #line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp116_ = i;
@@ -11978,19 +11979,19 @@ static void scanner_do_read (Scanner* self) {
 						_tmp118_ = _tmp117_->data_length;
 #line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						offset = _tmp116_ * _tmp118_;
-#line 11973 "scanner.c"
+#line 11974 "scanner.c"
 						{
 							gint x = 0;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							x = 0;
-#line 11978 "scanner.c"
+#line 11979 "scanner.c"
 							{
 								gboolean _tmp119_ = FALSE;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								_tmp119_ = TRUE;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								while (TRUE) {
-#line 11985 "scanner.c"
+#line 11986 "scanner.c"
 									gint _tmp121_ = 0;
 									ScanLine* _tmp122_ = NULL;
 									gint _tmp123_ = 0;
@@ -12009,13 +12010,13 @@ static void scanner_do_read (Scanner* self) {
 									gint _tmp135_ = 0;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (!_tmp119_) {
-#line 12004 "scanner.c"
+#line 12005 "scanner.c"
 										gint _tmp120_ = 0;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp120_ = x;
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										x = _tmp120_ + 1;
-#line 12010 "scanner.c"
+#line 12011 "scanner.c"
 									}
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp119_ = FALSE;
@@ -12029,7 +12030,7 @@ static void scanner_do_read (Scanner* self) {
 									if (!(_tmp121_ < _tmp123_)) {
 #line 1397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										break;
-#line 12024 "scanner.c"
+#line 12025 "scanner.c"
 									}
 #line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									_tmp124_ = line;
@@ -12051,7 +12052,7 @@ static void scanner_do_read (Scanner* self) {
 									if (((gint) _tmp129_) >= 192) {
 #line 1403 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										sample = (guchar) 3;
-#line 12046 "scanner.c"
+#line 12047 "scanner.c"
 									} else {
 										guchar _tmp130_ = '\0';
 #line 1404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12060,7 +12061,7 @@ static void scanner_do_read (Scanner* self) {
 										if (((gint) _tmp130_) >= 128) {
 #line 1405 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											sample = (guchar) 2;
-#line 12055 "scanner.c"
+#line 12056 "scanner.c"
 										} else {
 											guchar _tmp131_ = '\0';
 #line 1406 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12069,11 +12070,11 @@ static void scanner_do_read (Scanner* self) {
 											if (((gint) _tmp131_) >= 64) {
 #line 1407 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 1;
-#line 12064 "scanner.c"
+#line 12065 "scanner.c"
 											} else {
 #line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 0;
-#line 12068 "scanner.c"
+#line 12069 "scanner.c"
 											}
 										}
 									}
@@ -12089,7 +12090,7 @@ static void scanner_do_read (Scanner* self) {
 									_tmp135_ = block_shift;
 #line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 									if (_tmp135_ == 0) {
-#line 12084 "scanner.c"
+#line 12085 "scanner.c"
 										ScanLine* _tmp136_ = NULL;
 										guchar* _tmp137_ = NULL;
 										gint _tmp137__length1 = 0;
@@ -12119,14 +12120,14 @@ static void scanner_do_read (Scanner* self) {
 										block = (guchar) 0;
 #line 1417 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = 6;
-#line 12114 "scanner.c"
+#line 12115 "scanner.c"
 									} else {
 										gint _tmp142_ = 0;
 #line 1420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										_tmp142_ = block_shift;
 #line 1420 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = _tmp142_ - 2;
-#line 12121 "scanner.c"
+#line 12122 "scanner.c"
 									}
 								}
 							}
@@ -12135,7 +12136,7 @@ static void scanner_do_read (Scanner* self) {
 						_tmp143_ = block_shift;
 #line 1424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						if (_tmp143_ != 6) {
-#line 12130 "scanner.c"
+#line 12131 "scanner.c"
 							ScanLine* _tmp144_ = NULL;
 							guchar* _tmp145_ = NULL;
 							gint _tmp145__length1 = 0;
@@ -12165,7 +12166,7 @@ static void scanner_do_read (Scanner* self) {
 							block = (guchar) 0;
 #line 1429 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							block_shift = 6;
-#line 12160 "scanner.c"
+#line 12161 "scanner.c"
 						}
 					}
 				}
@@ -12178,7 +12179,7 @@ static void scanner_do_read (Scanner* self) {
 			_tmp152_ = _tmp151_->width;
 #line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp150_->data_length = ((_tmp152_ * 2) + 7) / 8;
-#line 12173 "scanner.c"
+#line 12174 "scanner.c"
 		}
 #line 1436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp153_ = job;
@@ -12196,18 +12197,18 @@ static void scanner_do_read (Scanner* self) {
 		_notify_unref0 (_tmp157_);
 #line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_line_unref0 (line);
-#line 12191 "scanner.c"
+#line 12192 "scanner.c"
 	}
 #line 1303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 12195 "scanner.c"
+#line 12196 "scanner.c"
 }
 
 
 static void _scanner_authorization_cb_sane_authcallback (const gchar* resource, gchar* username, gchar* password) {
 #line 1445 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_authorization_cb (resource, username, -1, password, -1);
-#line 12202 "scanner.c"
+#line 12203 "scanner.c"
 }
 
 
@@ -12251,7 +12252,7 @@ static void* scanner_scan_thread (Scanner* self) {
 	_tmp5_ = status;
 #line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
-#line 12246 "scanner.c"
+#line 12247 "scanner.c"
 		SANE_Status _tmp6_ = 0;
 		const gchar* _tmp7_ = NULL;
 #line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12264,7 +12265,7 @@ static void* scanner_scan_thread (Scanner* self) {
 		result = NULL;
 #line 1450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 12259 "scanner.c"
+#line 12260 "scanner.c"
 	}
 #line 1452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = version_code;
@@ -12284,7 +12285,7 @@ static void* scanner_scan_thread (Scanner* self) {
 	scanner_redetect (self);
 #line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
-#line 12279 "scanner.c"
+#line 12280 "scanner.c"
 		gboolean _tmp14_ = FALSE;
 		ScanState _tmp15_ = 0;
 #line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12293,7 +12294,7 @@ static void* scanner_scan_thread (Scanner* self) {
 		if (!_tmp14_) {
 #line 1460 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 12288 "scanner.c"
+#line 12289 "scanner.c"
 		}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = self->priv->state;
@@ -12301,7 +12302,7 @@ static void* scanner_scan_thread (Scanner* self) {
 		switch (_tmp15_) {
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_IDLE:
-#line 12296 "scanner.c"
+#line 12297 "scanner.c"
 			{
 				GList* _tmp16_ = NULL;
 #line 1465 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12312,83 +12313,83 @@ static void* scanner_scan_thread (Scanner* self) {
 					scanner_set_scanning (self, TRUE);
 #line 1468 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->state = SCAN_STATE_OPEN;
-#line 12307 "scanner.c"
+#line 12308 "scanner.c"
 				}
 #line 1470 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12311 "scanner.c"
+#line 12312 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_REDETECT:
-#line 12315 "scanner.c"
+#line 12316 "scanner.c"
 			{
 #line 1472 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_redetect (self);
 #line 1473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12321 "scanner.c"
+#line 12322 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_OPEN:
-#line 12325 "scanner.c"
+#line 12326 "scanner.c"
 			{
 #line 1475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_open (self);
 #line 1476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12331 "scanner.c"
+#line 12332 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_OPTION:
-#line 12335 "scanner.c"
+#line 12336 "scanner.c"
 			{
 #line 1478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_option (self);
 #line 1479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12341 "scanner.c"
+#line 12342 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_START:
-#line 12345 "scanner.c"
+#line 12346 "scanner.c"
 			{
 #line 1481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_start (self);
 #line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12351 "scanner.c"
+#line 12352 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_PARAMETERS:
-#line 12355 "scanner.c"
+#line 12356 "scanner.c"
 			{
 #line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_parameters (self);
 #line 1485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12361 "scanner.c"
+#line 12362 "scanner.c"
 			}
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_READ:
-#line 12365 "scanner.c"
+#line 12366 "scanner.c"
 			{
 #line 1487 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_read (self);
 #line 1488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12371 "scanner.c"
+#line 12372 "scanner.c"
 			}
 			default:
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 12376 "scanner.c"
+#line 12377 "scanner.c"
 		}
 	}
 #line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = NULL;
 #line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12383 "scanner.c"
+#line 12384 "scanner.c"
 }
 
 
@@ -12399,7 +12400,7 @@ static gpointer _scanner_scan_thread_gthread_func (gpointer self) {
 	scanner_unref (self);
 #line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12394 "scanner.c"
+#line 12395 "scanner.c"
 }
 
 
@@ -12407,7 +12408,7 @@ void scanner_start (Scanner* self) {
 	GError * _inner_error_ = NULL;
 #line 1495 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 12402 "scanner.c"
+#line 12403 "scanner.c"
 	{
 		GThread* _tmp0_ = NULL;
 		GThread* _tmp1_ = NULL;
@@ -12418,7 +12419,7 @@ void scanner_start (Scanner* self) {
 		_tmp0_ = _tmp1_;
 #line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12413 "scanner.c"
+#line 12414 "scanner.c"
 			goto __catch15_g_error;
 		}
 #line 1499 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12431,7 +12432,7 @@ void scanner_start (Scanner* self) {
 		self->priv->thread = _tmp2_;
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (_tmp0_);
-#line 12426 "scanner.c"
+#line 12427 "scanner.c"
 	}
 	goto __finally15;
 	__catch15_g_error:
@@ -12451,7 +12452,7 @@ void scanner_start (Scanner* self) {
 		g_critical ("scanner.vala:1503: Unable to create thread: %s", _tmp4_);
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_error_free0 (e);
-#line 12446 "scanner.c"
+#line 12447 "scanner.c"
 	}
 	__finally15:
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12462,7 +12463,7 @@ void scanner_start (Scanner* self) {
 		g_clear_error (&_inner_error_);
 #line 1497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 12457 "scanner.c"
+#line 12458 "scanner.c"
 	}
 }
 
@@ -12479,7 +12480,7 @@ void scanner_redetect (Scanner* self) {
 	if (_tmp0_) {
 #line 1510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 12474 "scanner.c"
+#line 12475 "scanner.c"
 	}
 #line 1511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->need_redetect = TRUE;
@@ -12491,7 +12492,7 @@ void scanner_redetect (Scanner* self) {
 	_tmp2_ = request_redetect_new ();
 #line 1515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
-#line 12486 "scanner.c"
+#line 12487 "scanner.c"
 }
 
 
@@ -12506,7 +12507,7 @@ gboolean scanner_is_scanning (Scanner* self) {
 	result = _tmp0_;
 #line 1520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12501 "scanner.c"
+#line 12502 "scanner.c"
 }
 
 
@@ -12521,7 +12522,7 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 	switch (_tmp0_) {
 #line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_DEFAULT:
-#line 12516 "scanner.c"
+#line 12517 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 1528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12530,11 +12531,11 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp1_;
 #line 1528 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12525 "scanner.c"
+#line 12526 "scanner.c"
 		}
 #line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_COLOR:
-#line 12529 "scanner.c"
+#line 12530 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12543,11 +12544,11 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp2_;
 #line 1530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12538 "scanner.c"
+#line 12539 "scanner.c"
 		}
 #line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_GRAY:
-#line 12542 "scanner.c"
+#line 12543 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12556,11 +12557,11 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp3_;
 #line 1532 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12551 "scanner.c"
+#line 12552 "scanner.c"
 		}
 #line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_LINEART:
-#line 12555 "scanner.c"
+#line 12556 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12569,7 +12570,7 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp4_;
 #line 1534 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12564 "scanner.c"
+#line 12565 "scanner.c"
 		}
 		default:
 		{
@@ -12583,7 +12584,7 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp6_;
 #line 1536 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12578 "scanner.c"
+#line 12579 "scanner.c"
 		}
 	}
 }
@@ -12600,7 +12601,7 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 	switch (_tmp0_) {
 #line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_SINGLE:
-#line 12595 "scanner.c"
+#line 12596 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12609,11 +12610,11 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp1_;
 #line 1545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12604 "scanner.c"
+#line 12605 "scanner.c"
 		}
 #line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_FRONT:
-#line 12608 "scanner.c"
+#line 12609 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 1547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12622,11 +12623,11 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp2_;
 #line 1547 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12617 "scanner.c"
+#line 12618 "scanner.c"
 		}
 #line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BACK:
-#line 12621 "scanner.c"
+#line 12622 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12635,11 +12636,11 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp3_;
 #line 1549 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12630 "scanner.c"
+#line 12631 "scanner.c"
 		}
 #line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BOTH:
-#line 12634 "scanner.c"
+#line 12635 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12648,7 +12649,7 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp4_;
 #line 1551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12643 "scanner.c"
+#line 12644 "scanner.c"
 		}
 		default:
 		{
@@ -12662,7 +12663,7 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp6_;
 #line 1553 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12657 "scanner.c"
+#line 12658 "scanner.c"
 		}
 	}
 }
@@ -12733,17 +12734,17 @@ void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options) {
 	_tmp1_ = device;
 #line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ != NULL) {
-#line 12728 "scanner.c"
+#line 12729 "scanner.c"
 		const gchar* _tmp2_ = NULL;
 #line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = device;
 #line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
-#line 12734 "scanner.c"
+#line 12735 "scanner.c"
 	} else {
 #line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = "(null)";
-#line 12738 "scanner.c"
+#line 12739 "scanner.c"
 	}
 #line 1559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = options;
@@ -12893,7 +12894,7 @@ void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options) {
 	g_async_queue_push (_tmp54_, _tmp55_);
 #line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_request_unref0 (request);
-#line 12886 "scanner.c"
+#line 12887 "scanner.c"
 }
 
 
@@ -12913,14 +12914,14 @@ void scanner_cancel (Scanner* self) {
 	_tmp2_ = request_cancel_new ();
 #line 1581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
-#line 12906 "scanner.c"
+#line 12907 "scanner.c"
 }
 
 
 static gpointer _g_thread_ref0 (gpointer self) {
 #line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? g_thread_ref (self) : NULL;
-#line 12913 "scanner.c"
+#line 12914 "scanner.c"
 }
 
 
@@ -12942,7 +12943,7 @@ void scanner_free (Scanner* self) {
 	_tmp2_ = self->priv->thread;
 #line 1590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_ != NULL) {
-#line 12935 "scanner.c"
+#line 12936 "scanner.c"
 		GThread* _tmp3_ = NULL;
 		GThread* _tmp4_ = NULL;
 #line 1592 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12955,13 +12956,13 @@ void scanner_free (Scanner* self) {
 		_g_thread_unref0 (self->priv->thread);
 #line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->thread = NULL;
-#line 12948 "scanner.c"
+#line 12949 "scanner.c"
 	}
 #line 1596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	sane_exit ();
 #line 1597 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1597: sane_exit ()");
-#line 12954 "scanner.c"
+#line 12955 "scanner.c"
 }
 
 
@@ -12980,19 +12981,19 @@ static void g_cclosure_user_marshal_VOID__SCAN_PAGE_INFO (GClosure * closure, GV
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 12973 "scanner.c"
+#line 12974 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 12979 "scanner.c"
+#line 12980 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__SCAN_PAGE_INFO) (marshal_data ? marshal_data : cc->callback);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_page_info (param_values + 1), data2);
-#line 12985 "scanner.c"
+#line 12986 "scanner.c"
 }
 
 
@@ -13011,19 +13012,19 @@ static void g_cclosure_user_marshal_VOID__SCAN_LINE (GClosure * closure, GValue
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 13004 "scanner.c"
+#line 13005 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 13010 "scanner.c"
+#line 13011 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__SCAN_LINE) (marshal_data ? marshal_data : cc->callback);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_line (param_values + 1), data2);
-#line 13016 "scanner.c"
+#line 13017 "scanner.c"
 }
 
 
@@ -13042,26 +13043,26 @@ static void g_cclosure_user_marshal_VOID__INT_STRING (GClosure * closure, GValue
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 13035 "scanner.c"
+#line 13036 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 13041 "scanner.c"
+#line 13042 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__INT_STRING) (marshal_data ? marshal_data : cc->callback);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 13047 "scanner.c"
+#line 13048 "scanner.c"
 }
 
 
 static void value_scanner_init (GValue* value) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 13054 "scanner.c"
+#line 13055 "scanner.c"
 }
 
 
@@ -13070,7 +13071,7 @@ static void value_scanner_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (value->data[0].v_pointer);
-#line 13063 "scanner.c"
+#line 13064 "scanner.c"
 	}
 }
 
@@ -13080,11 +13081,11 @@ static void value_scanner_copy_value (const GValue* src_value, GValue* dest_valu
 	if (src_value->data[0].v_pointer) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scanner_ref (src_value->data[0].v_pointer);
-#line 13073 "scanner.c"
+#line 13074 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 13077 "scanner.c"
+#line 13078 "scanner.c"
 	}
 }
 
@@ -13092,37 +13093,37 @@ static void value_scanner_copy_value (const GValue* src_value, GValue* dest_valu
 static gpointer value_scanner_peek_pointer (const GValue* value) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 13085 "scanner.c"
+#line 13086 "scanner.c"
 }
 
 
 static gchar* value_scanner_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 13092 "scanner.c"
+#line 13093 "scanner.c"
 		Scanner* object;
 		object = collect_values[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13099 "scanner.c"
+#line 13100 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13103 "scanner.c"
+#line 13104 "scanner.c"
 		}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scanner_ref (object);
-#line 13107 "scanner.c"
+#line 13108 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13111 "scanner.c"
+#line 13112 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 13115 "scanner.c"
+#line 13116 "scanner.c"
 }
 
 
@@ -13133,25 +13134,25 @@ static gchar* value_scanner_lcopy_value (const GValue* value, guint n_collect_va
 	if (!object_p) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 13126 "scanner.c"
+#line 13127 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 13132 "scanner.c"
+#line 13133 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 13136 "scanner.c"
+#line 13137 "scanner.c"
 	} else {
 #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 13141 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 13144 "scanner.c"
+#line 13145 "scanner.c"
 }
 
 
@@ -13165,7 +13166,7 @@ GParamSpec* param_spec_scanner (const gchar* name, const gchar* nick, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 13158 "scanner.c"
+#line 13159 "scanner.c"
 }
 
 
@@ -13174,7 +13175,7 @@ gpointer value_get_scanner (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCANNER), NULL);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 13167 "scanner.c"
+#line 13168 "scanner.c"
 }
 
 
@@ -13194,17 +13195,17 @@ void value_set_scanner (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_ref (value->data[0].v_pointer);
-#line 13187 "scanner.c"
+#line 13188 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13191 "scanner.c"
+#line 13192 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
-#line 13197 "scanner.c"
+#line 13198 "scanner.c"
 	}
 }
 
@@ -13223,17 +13224,17 @@ void value_take_scanner (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 13216 "scanner.c"
+#line 13217 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13220 "scanner.c"
+#line 13221 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
-#line 13226 "scanner.c"
+#line 13227 "scanner.c"
 	}
 }
 
@@ -13263,7 +13264,7 @@ static void scanner_class_init (ScannerClass * klass) {
 	g_signal_new ("document_done", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("scanning_changed", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 13256 "scanner.c"
+#line 13257 "scanner.c"
 }
 
 
@@ -13272,7 +13273,7 @@ static void scanner_instance_init (Scanner * self) {
 	self->priv = SCANNER_GET_PRIVATE (self);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 13265 "scanner.c"
+#line 13266 "scanner.c"
 }
 
 
@@ -13300,7 +13301,7 @@ static void scanner_finalize (Scanner* obj) {
 	_g_hash_table_unref0 (self->priv->options);
 #line 250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 13293 "scanner.c"
+#line 13294 "scanner.c"
 }
 
 
@@ -13325,7 +13326,7 @@ gpointer scanner_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 13318 "scanner.c"
+#line 13319 "scanner.c"
 }
 
 
@@ -13338,7 +13339,7 @@ void scanner_unref (gpointer instance) {
 		SCANNER_GET_CLASS (self)->finalize (self);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 13331 "scanner.c"
+#line 13332 "scanner.c"
 	}
 }
 
@@ -13361,4 +13362,16 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 }
 
 
+static gint _vala_array_length (gpointer array) {
+	int length;
+	length = 0;
+	if (array) {
+		while (((gpointer*) array)[length]) {
+			length++;
+		}
+	}
+	return length;
+}
+
+
 
diff --git a/src/simple-scan.c b/src/simple-scan.c
index f474954..38e44ab 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -1,4 +1,4 @@
-/* simple-scan.c generated by valac 0.26.2, the Vala compiler
+/* simple-scan.c generated by valac 0.28.0, the Vala compiler
  * generated from simple-scan.vala, do not modify */
 
 /*
@@ -2697,37 +2697,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1198 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1198 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 2712 "simple-scan.c"
 		glong _tmp4_ = 0L;
-#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
 #line 2720 "simple-scan.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
 #line 2732 "simple-scan.c"
 	}
@@ -2747,112 +2747,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1208 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 2756 "simple-scan.c"
 		glong _tmp2_ = 0L;
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 2762 "simple-scan.c"
 	} else {
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 2766 "simple-scan.c"
 	}
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 2770 "simple-scan.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 2782 "simple-scan.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 2792 "simple-scan.c"
 	}
-#line 1217 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1217 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 2798 "simple-scan.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1219 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1219 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 2812 "simple-scan.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 2822 "simple-scan.c"
 	}
-#line 1223 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1223 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1223 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1223 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 2828 "simple-scan.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 2837 "simple-scan.c"
 	}
-#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
 #line 2857 "simple-scan.c"
 }
diff --git a/src/ui.c b/src/ui.c
index 6c6e8b5..917edd3 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1,4 +1,4 @@
-/* ui.c generated by valac 0.26.2, the Vala compiler
+/* ui.c generated by valac 0.28.0, the Vala compiler
  * generated from ui.vala, do not modify */
 
 /*
@@ -1772,33 +1772,33 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 930 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 930 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) (-1), _tmp1_);
-#line 931 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 933 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 933 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 933 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 933 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
 #line 1790 "ui.c"
 		gchar* _tmp4_ = NULL;
-#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 934 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
 #line 1798 "ui.c"
 	} else {
-#line 936 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 936 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		result = -1;
-#line 936 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 936 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
 #line 1804 "ui.c"
 	}
@@ -1822,103 +1822,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	gchar* _tmp21_ = NULL;
-#line 1230 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1230 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1231 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1232 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1232 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
 #line 1838 "ui.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1233 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
 #line 1847 "ui.c"
 	}
-#line 1235 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1235 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
 #line 1853 "ui.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1236 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
 #line 1862 "ui.c"
 	}
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
 #line 1868 "ui.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
 #line 1877 "ui.c"
 	} else {
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
 #line 1881 "ui.c"
 	}
-#line 1238 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1238 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
 #line 1889 "ui.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
 #line 1898 "ui.c"
 	} else {
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
 #line 1902 "ui.c"
 	}
-#line 1239 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1239 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1240 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1240 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1241 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1241 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
 #line 1924 "ui.c"
 }
@@ -2085,37 +2085,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1197 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1198 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1198 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1198 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 2101 "ui.c"
 		glong _tmp4_ = 0L;
-#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1199 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1199 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
 #line 2109 "ui.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1201 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1201 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		return result;
 #line 2121 "ui.c"
 	}
@@ -2135,112 +2135,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
 	gchar* _tmp22_ = NULL;
-#line 1208 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 2145 "ui.c"
 		glong _tmp2_ = 0L;
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 2151 "ui.c"
 	} else {
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 2155 "ui.c"
 	}
-#line 1210 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 2159 "ui.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1212 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1212 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 2171 "ui.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1214 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 2181 "ui.c"
 	}
-#line 1217 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1217 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 2187 "ui.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1218 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1219 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1219 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1219 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 2201 "ui.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1221 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1221 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 2211 "ui.c"
 	}
-#line 1223 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1223 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1223 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1223 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 2217 "ui.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1224 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1224 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 2226 "ui.c"
 	}
-#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1226 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1226 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1227 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
 #line 2246 "ui.c"
 }
@@ -6009,15 +6009,15 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 996 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 996 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 997 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
 	return result;
 #line 6023 "ui.c"
 }
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2015-06-28 12:27:50 +0200
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2015-06-28 12:27:50 +0200
commit	84bcd0b97df992d9e633cf3c3b9382f202e4f754 (patch)
tree	8bae1f453a0723e74b7f6b6e349775475ba730e1
parent	21b9155ede6470d02c0aa026131532092e2db8d0 (diff)
parent	c2b991e03eeccb2c87efb12455bb674caa083f15 (diff)